Merge pull request #16 from jjlee5266/heroku

re-added 12factor gem in a branch
FS edit,update,destroy
Merge pull request #17 from jjlee5266/ft_edit

FS edit,update,destroy
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
added sleep on rake task
Merge branch 'master' of github.com:jjlee5266/Where-Fi into heroku