rearranging things
Merge branch 'master' of ssh://github.com/mdotson1/cs338f13p1
stuff changing