got stuff working
WORKING
Merge branch 'master' of https://github.com/hspinks/cs108