integrating jeff's mockups with stubs for functionality
Merge branch 'develop' into feature/appengine
swap images with semi-functional keyboard and staff