changed some stuff

deleted stuff and moved stuff around
Merge branch 'master' of https://github.com/oa2013/sheepgame

Conflicts:
	FirstDrafProj/Library/CurrentLayout.dwlt
	FirstDrafProj/Library/expandedItems
	FirstDrafProj/Library/guidmapper