Views and Controller Update
Merge branch 'master' of https://github.com/dodecahedron1/2014FallWeb