Shorten the name
Nope standing up
Merge branch 'master' of https://github.com/20MileInteractive/GitProject

Conflicts:
	public_html/index.html