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

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