app.css
Merge branch 'master' of https://github.com/Th

Conflicts:
	app/css/app.css
side nag fix