making a mess of things
Merge branch 'master' of https://github.com/photusenigma/Git-Jason

Conflicts:
	index.php
I got me some changes here!