up
Merge branch 'master' of https://github.com/PCMTeam1/PCMCE.git

Conflicts:
	Project_PCMCE/war/Project_PCMCE.html
Merge branch 'master' of git@github.com:PCMTeam1/PCMCE.git