created the pseudocode for controllers
Merge branch 'master' into controller
merge in changes
Merge branch 'controller'
mergin in joe + eddie's work on controllers