Lets get angular and angular fire
Merge branch 'master' of https://github.com/9o/NewHaven--

Conflicts:
	index.html
	index.js