Dev to Master

Hey!  A proper pull request.  I went back to this assignment and cleaned it up.  Aside from the clean pull request from dev to master I deleted commented code out, added a grunt test, fixed an issue where the server had to be restarted for the app get route to work each time.  Ignore the previous submission I sent in for this homework.  Or compare the two and marvel at how far I've come in four short weeks of this social experiment to see how much a learning a human being can handle before they break.
this probably doesn't need to be a if/else, I would try to clean this up.