Merge branch 'master' of heroku.com:jukehacker
Merge branch 'master' of heroku.com:jukehacker
Merge pull request #84 from itorres1/master

up to date