Commit local changes
Merge branch 'master' of https://github.com/linkfan03/MorphGame
fixed character bugs working on unique character behavior
fixed bugs working on unique character stuff
fixed bugs will add unique character stuff
agag
commit
default
default
meta stuff deleated so it could merge
Merge branches 'master' and 'greg'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers
	.metadata/.plugins/org.eclipse.jdt.core/55181.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt