commit
Merge branch 'master' of https://github.com/EmileDu/TFA_Dev

Conflicts:
	Build/Lazy_Lunch.html
	Build/index.html
	includes/_header.html