making uploaded for user profile pic
now have a working profile pic uploader
fixing merge conflict from changing html to HAML