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.
Update .gitignore
Added initial user authentication controller and jplayer template
Update .gitignore
Finished narrative view and added user authentication
Border fix in login.php
Merge branch 'master', remote-tracking branch 'origin' into Dror
Finished User authentication
new database for sprint 2
Finished Jplayer
Merge branch 'Dror' of https://github.com/ThomasRahn/soen390 into Development
added duration, merged branch with dror, added reset function
added logout, and admin dashboard
Added foreign key ID field name for relationship.
Added new API controller for narratives.
Integrated Shahrad's prior implementation for testing purposes.
modified admin interface with boostrap 3.0