Facilities page
Merge branch 'master' of https://github.com/lakario/HackForLA

Conflicts:
	app/css/app.css
	app/index.html
	app/partials/facilities.html
Merge branch 'master' of https://github.com/lakario/HackForLA

Conflicts:
	app/index.html
	app/js/services.js
wtf merge?
fixed