rolled back to angularFire
Merge branch 'master' of https://github.com/terriblesarcasm/testing-node

Conflicts:
	public/js/app.js