Merge pull request #6 from pocket-gophers-2014/Events_Migrations

Fruth approved.  Events migrations
added database from master
added user controller and view for user profile
Merge pull request #7 from pocket-gophers-2014/users_view_and_controller

Fruth approved. Users view and controller
Add all models
Merge pull request #8 from pocket-gophers-2014/add_models

Add all models
Fix users to include email and phone number, no username
Merge pull request #9 from pocket-gophers-2014/email_branch

Fix users to include email and phone number, no username
Add attr_accessible to User Model, more accessibility may be needed
fix user migration, do not need password, just password_digest
Merge pull request #10 from pocket-gophers-2014/user_model_migration

User model migration
take out password in user model
Merge pull request #11 from pocket-gophers-2014/fix_user_model

take out password in user model
Revert "fix user migration, do not need password, just password_digest"

This reverts commit 2b4fd44632379f6e163d7b7ba20d4383a66780fd.

Conflicts:
	app/models/user.rb
REAL USER  MODEL
Merge pull request #13 from pocket-gophers-2014/user_model_fix

User model fix