change edit rating form to show stars select
Merge branch 'master' into google_login

"merge maps functionality from master"
add non-functioning login with Google - doesnt break, but doesnt work either
fix merge conflicts
get login with Google working
add photo_url to users with imported google picture
add username and password back with validation testing
resolve merge conflicts
Merge pull request #12 from supremebeing7/google_login

Got it working! Login with Google, complete with profile pic. All rspec tests pass.