Just testing my commit
Create user table migrate
Nog een extra verandering
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/ExpendsController.php
added lines to the create users migrate