Merge pull request #3 from mike6838/controller

Controller
added some views
Merge branch 'views'
merging views
added views
jquery halfway done