committing views
Merge branch 'master' of https://github.com/JAWA21/markularity

Conflicts:
	app/Controller/UsersController.php