grrr
Merge branch 'master' of https://github.com/kroboga/it355project

Conflicts:
	include/header.php
Merge branch 'master' of https://github.com/kroboga/it355project

Conflicts:
	include/header.php