style
Merge branch 'master' of https://github.com/Fathalian/nestor

Conflicts:
	app/styles/main.css