made controllers, working on views
Merge branch 'master' into create_basic_controllers_and_views
implemented basic views, controllers
resolved merge conflict
Merge pull request #6 from dhouk24/create_basic_controllers_and_views

Create basic controllers and views