idea
Merge branch 'master' of https://github.com/1d20/softcycle
Merge branch 'master' of https://github.com/1d20/softcycle
idea
Merge remote-tracking branch 'origin/master'
idea
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/sass/main.scss
design
design style
design style
Merge remote-tracking branch 'origin/master'
design style-2
Merge remote-tracking branch 'origin/master'