sry guys i had to.
Merge branch 'testing' of https://github.com/sonnemannt1/A100-Project2-Group5 into testing

Conflicts:
	application/views/LoginView.php