minor changes
Merge branch 'master' of https://github.com/sethicis/cs485proj4LandK into working
Merge branch 'master' into working
Merge branch 'working'