Danila Fedorin 7d548c390a Merge branch 'daniel-server' ... # Conflicts: # public/scss/main.scss		2018-06-12 22:51:31 -07:00
..
Go	Merge branch 'daniel-server'	2018-06-12 22:51:31 -07:00
Go.cr	Add rules.ecr and change background image.	2018-06-12 21:01:28 -07:00