input almost done
just before merge
merging after lukes wierd stuff
for merge
Merge branch 'master' of https://github.com/nightwolf55la/CS206