misc
Merge branch 'master' of https://github.com/gg-trickitty/nazaem

Conflicts:
	app/styles/main.scss