user model finished
create_user.erb finished
about to merge with local master
working on user_profile.erb