Changes to protoype
Merge prototype
Merge branch 'master' of github.com:arcydouglass/massage
Merge branch 'master' of github.com:arcydouglass/massage
Conflict Resolution
Merge branch 'master' of github.com:arcydouglass/massage
Merge branch 'master' of github.com:arcydouglass/massage
Merge branch 'master' of github.com:arcydouglass/massage