testing branch
Merge branch 'master' into pwd

Conflicts:
	islandsServer/.gitignore
adding users.csv to password branch for heroku deploy
changed vote to have load and unload vote
changed to simpler authentication scheme to accomodate flash client
merged .gitignore from master
use pg gem instead of sqlite for heroku
new bundle file or whatever
testing flash client for heroku
using 'username' instead of 'code' for auth
Merge branch 'master' into pwd
use firstName lastName in user, fixed register call and votes summary.
added flash files
users info, new flash client
create meter_readings
remove index method for meter_readings
started on update_game method
merged master
configure energy-streetfight domain
fixed bug in meter_readings