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

Conflicts:
	config/initializers/geocoder.rb