add column 'phonenumber' and 'major' to user
Merge pull request #39 from DonutWorks/feat/user-profile-more-detail

add column 'phonenumber' and 'major' to user #34
Merge branch 'master' of https://github.com/DonutWorks/Ari into feat/issue-#37

Conflicts:
	app/views/admin/index.html.erb
	db/schema.rb