third commit for 12 factor gem
Merge branch 'master' of github.com:jjlee5266/Where-Fi into heroku
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