Merge pull request #1 from ThomasRahn/Dror

Added Migration files
Added all the models
Merge pull request #2 from ThomasRahn/Development

Added Models
Merge branch 'Development' of https://github.com/ThomasRahn/soen390
Added initial view and models and narrative controller
Merge branch 'master' of https://github.com/ThomasRahn/soen390
Merge pull request #3 from ThomasRahn/master

models, controllers, settings
Main login page
Merge branch 'Development' of https://github.com/ThomasRahn/soen390 into Development

Conflicts:
	soen390/app/database/production.sqlite
	soen390/app/routes.php
Added login view and associated styles.