a
Merge branch 'master' of https://github.com/FunkeyFlo/seflab05

Conflicts:
	SEFLab/views/home.php