added gems and altered user migration (renamed name to username)
Merge branch 'master' into user_sign_up
added routes for user
added actions for user controller without implementation
added user model and relationships to events and comments
resolved conflict in gemfile

Merge branch 'master' into user_sign_up

Conflicts:
	Gemfile