Kevin's changes
Merge branch 'master' of https://github.com/cassiecorey/Sobriety
some more changes