Finished Welcome Page
Merge branch 'master' of https://github.com/Fit-Genie/fit-genie-app

Conflicts:
	fitcss-temp/css/main.css.map