Remove user attributes from user migration
Merge branch 'master' of heroku.com:mkdir

Conflicts:
	app/assets/stylesheets/application.css.scss