minor changes
Merge branch 'master' of github.com:jjlee5266/Where-Fi

Conflicts:
	where-fi_app/lib/tasks/admin.rake
Added a maps render.  Added necessary variables for good views on each view.
successfully added point system and charts
add search for nearby establishments
Merge pull request #20 from jjlee5266/chart

Chart
added tabs to each statement.  spacing
Merge pull request #19 from jjlee5266/maps_refactor

Added a maps render.  Added necessary variables for good views on each v...
This is the prelim of comments.  It works, but does not include the location or user ID in the forms.
Moved everything to the root directory
Twitter capabilities
Merge branch 'master' of github.com:jjlee5266/Where-Fi into twitter
Merge branch 'master' of github.com:jjlee5266/Where-Fi into comments
I picked the lastest version number in the schema.
Conflicts:
	app/views/locations/show.html.erb
	db/schema.rb
deleted extra where-fi_app and moved the contained files
This commit is unrelated to comments.  We created a new file called locations_helper where we put a method which helps with the map zoom.
Merge pull request #21 from jjlee5266/comments

Comments
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