Removed ds_store
resolved conflict deleting ds store
don't know what it's complaining about
Updated buttons on profile
Merge branch 'master' of https://github.com/jchand/chowroulette