rebased front end
connected controller with view
Merge pull request #81 from robertn702/controllerview

Connected controller to view