trying not to mess it up
Merge branch 'master' of https://github.com/egelon/iDog-Website

Conflicts:
	model/registrationModel.php
	router/include.php
	router/router.php
Merge branch 'master' of https://github.com/egelon/iDog-Website
fixed user registration