created user, activity model and controller, session controller
fixed schema merge conflict