update to add image file
Merge branch 'master' of heroku.com:frittie
clean up and comment out old code
Merge branch 'master' of heroku.com:frittie
fix conflict code
test social login