Removed/commented code, added try/catch blocks to make application more safe
Merge branch 'master' of https://github.com/jayh92/DrinkMate