first commit
Merge branch 'master' of https://github.com/cstayton/S5-Android_Kitchen