building out views and controllers
fixed merge conflict with json file
Merge pull request #18 from Cynaria/building_sprint_1_views

Building sprint 1 views