nothing much.
Merge branch 'master' of https://github.com/justinjim/CSC309A2

Conflicts:
	application/controllers/site.php