updated out error catching
Merge branch 'master' of https://github.com/person594/cs153
changed up our directories