[feature]add profiles to users
Merge pull request #2 from peterzd/user_profiles

[feature]add profiles to users
Merge branch 'dev' into init_albums

Conflicts:
	db/schema.rb