MVP

Updated MVP
Merge branch 'dev' of https://github.com/CanvasApp/CanvasApp into dev
commit styles
Merge pull request #24 from CanvasApp/styles

Styles