fixed welcome message bug and list ordering
Merge branch 'master' of https://github.com/Ryabrandt/Drink-Me