fixed my bugs
Merge branch 'master' of github.com:ekelleyv/HCI