unsure?

I suck
Merge branch 'master' of https://github.com/RiddickJordan/GreenspaceStudio

Conflicts:
	index.html