third commit for 12 factor gem
Merge branch 'master' of github.com:jjlee5266/Where-Fi into heroku
Twitter capabilities
Merge branch 'master' of github.com:jjlee5266/Where-Fi into twitter
added Twitter Integration and sort_by function
Merge branch 'twitter'
maps stuff
Merge branch 'master' of github.com:jjlee5266/Where-Fi into twitter

Conflicts:
	app/views/application/home.html.erb
Merge pull request #22 from jjlee5266/twitter

Twitter Integration and Sort_by function
Merge branch 'master' of github.com:jjlee5266/Where-Fi
fixed merge error.  changed map render.
Merge branch 'master' of github.com:jjlee5266/Where-Fi
updated google zoom values
Merge branch 'master' of github.com:jjlee5266/Where-Fi into heroku
updated the gemfile, the rest of these commit are just generally updating this branch to the new file format

Conflicts:
	Gemfile
Merge pull request #24 from jjlee5266/heroku

Heroku
Merge branch 'master' into comments

Conflicts:
	config/routes.rb