Merge branch 'develop' of github.com:FuckUpNight/FuckUpNight-Template into develop

Conflicts:
	index.html
	scss/_fuckupnight.scss
	scss/_settings.scss
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	index.html