Some more work
Merge branch 'master' of github.com:kevd1337/startupbus-tastebuddyapp