working on stuff
resolving merge conflicts
reworked views
resolved conflicts
more conflicts
Merge pull request #3 from bengolden/Building_Initial_Views_and_Controllers

Building initial views and controllers