add a photo to the user profile
in process of adding photo upload to user profile
changed :attachemnt to :avatar in ApplicationsController
moved tmp folder into .gitignore
Merge pull request #2 from cprater/add_photo_to_profile

Add photo to profile
fixing merge conflicts