delete some stuff
Merge branch 'master' of https://github.com/stevevdvkpe/cis399-2013

Conflicts:
	README.md

fixed merge conflict