commit
Merge branch 'master' of
ssh://git@github.com/alexrcoleman/Jolex-Website.git into JoeBranch

Conflicts:
	Website Server/src/com/jolex/website/WebsiteMain.java