added new tables and migrated
added controllers, views, and user authentication
Edited the merges