reconciling changesin order to merge
changes to controllers.js
Merge branch 'jordan-add-custom-term' of https://github.com/AustinClift/DigitalFlash

# By Jordan
# Via Jordan
* 'jordan-add-custom-term' of https://github.com/AustinClift/DigitalFlash:
  changes to controllers.js
  reconciling changesin order to merge
Bug in controllers.  Ended controller and left out other functions.  Fixed.