fix anim
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/templates/home/index.html
Merge branch 'master' of https://github.com/1d20/softcycle

Conflicts:
	frontend/templates/home/index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/sass/main.scss
	templates/index.html
Merge remote-tracking branch 'origin/master'