added more unit tests, refactored redundant code
Merge branch 'master' of https://github.com/jbailey2010/The-Inebriater-Mobile