Removed Ryan's midterm controller.js
Merge branch 'develop' of github.com:thortek/dgm4790-spring2014 into develop

# By Ryan Martin
# Via Ryan Martin
* 'develop' of github.com:thortek/dgm4790-spring2014:
  no message