Scratch commit.
Staging commit.
Merge branch 'server' of https://github.com/AWDGroup/CMPT275-05 into server

Conflicts:
	site/mole-details.php
	site/profile.php
	site/template.php