saving
added facebook login
removed shit
Merge remote-tracking branch 'origin' into feature/add-sign-up-user-page

Conflicts:
	server.js
	server/components/signup_user/index.js
	server/views/layouts/main.hbs