Working version!! many changes, small though.
Merge branch 'develop' of https://github.com/gminaker/cs410 into develop