add parse and facebook login
Merge branch 'master' of https://github.com/JudyTai/wheresmystuff

Conflicts:
	project.html