Updating repo - transferring from laptop
Merge branch 'dev-master' of github.com:zburnham/shapeupdemo into dev-master