fixed GMaps Query Problem?
Merge pull request #23 from jjlee5266/twitter

fixed GMaps Query Problem?
key stuff.  As in API Key stuff, not important stuff, although API KEYS are non-trivial.
Merge pull request #25 from jjlee5266/charts

key stuff.  As in API Key stuff, not important stuff, although API KEYS ...
push to heroku
Merge pull request #28 from jjlee5266/heroku

push to heroku
add forgotten password function/ not working
2nd go at heroku
removed geocoder settings.rb, added geocoder.rb to initializer.
params unable to pass
added classes for our API logins.  Also, made corresponding changes across site.
added flash message
Merge pull request #31 from jjlee5266/flash

added flash message
password function does not work
Merge branch 'master' of github.com:jjlee5266/Where-Fi into forgotten_pw

Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/application.html.erb
Merge pull request #32 from jjlee5266/forgotten_pw

Forgotten pw
remove bad password function
Merge pull request #33 from jjlee5266/update

remove bad password function
Merge branch 'master' into heroku

Conflicts:
	app/controllers/application_controller.rb
	config/initializers/geocoder.rb
Merge pull request #29 from jjlee5266/heroku

2nd go at heroku