Initial commit
Added GlitchStitch
GameOne
Updated GlitchStitch
Delete .log
Delete .lock
Delete version.ini
gitignore
Merge branch 'master' of https://github.com/crowcasso/420_fall14

Conflicts:
	.metadata/.log
	.metadata/version.ini
Delete workbench.xmi
remove metadata
Merge branch 'master' of https://github.com/crowcasso/420_fall14
Brand New GlitchStitch
Updated switchState()
Added jumping, climbing, and gravity
Second attempt at merging