Added the header and footer
Added Facebook login
Merge branch 'master' of https://github.com/purepennons/What-To-Eat

Conflicts:
	meteor/lib/router.js
Resolved conflict