Controller (Updated)

11/12/2013 3:35 PM - I have of questions for you guys when we meet Thursday. Until then, let me know what you think or if there's anything immediate that I can change.
Merge pull request #2 from slyfoxes/patch-1

Controller (Updated)