Setup Parse
Firebase works with facebook
Facebook login with Firebase works
Merge branch 'master' of https://github.com/dannynelson/giftlist

Conflicts:
	app/www/js/controllers.js