making progress

i think
Merge branch 'master' of https://github.com/benshadburne/mis333kproject