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

Conflicts:
	Build/assets/js/main.js
	Build/index.html
	Build/lazylunch.html
	assets/js/main.js
	index.html
	lazylunch.html
commit