first commit
Initial dist subtree commit
Add php file
change index
Change index file
Change Index text
Merge commit '3ddb72eb922bf54ec33ec5837409cd217e6b8d95' into staging

Conflicts:
	dist/index.html
Changes have been made
Change text
transfer files over
Update gulp file to include projects
Merge remote-tracking branch 'origin/staging' into deploy

Conflicts:
	index.html
	scripts/main.js
	styles/main.css