Views
Merge branch 'master' of https://github.com/jixuan90/hackathonPrototype