Added map stuff to our app
Merge branch 'master' of github.com:jjlee5266/Where-Fi into maps

Conflicts:
	where-fi_app/app/views/users/show.html.erb
Merge pull request #18 from jjlee5266/maps

Added map stuff to our app