making changes
Merge branch 'master' of github.com:franklinho/drunkwithme
Merge branch 'master' of github.com:franklinho/drunkwithme
Fixing stupid bug