buildings update
Merge branch 'master' of https://github.com/fast4y/Ninjaes

Conflicts:
	public/css/app.css
	public/css/app.styl