Fixed constants includes
Merge branch 'JesseMOE'
Merge branch 'master' of git@github.com:landonepps/MOE.git into JesseMOE
Merge branch 'master' of git@github.com:landonepps/MOE.git
Merge branch 'master' of git@github.com:landonepps/MOE.git
Merge branch 'master' into JesseMOE
Commented and fixed windows timer placement
Merge branch 'master' of git@github.com:landonepps/MOE.git