bug fixes to control
Merge branch 'master' of ssh://github.com/anadon/cs3141-calander