to master
added sounds
Merge branches 'master' and 'greg'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/MorphGame/.indexes/e4/fa/history.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
Update Tile.java
Update StartingClass.java
Update MainCharacter.java
Update map1.txt
Update Tile.java
Commit local changes
Merge branch 'master' of https://github.com/linkfan03/MorphGame
fixed character bugs working on unique character behavior
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
Added leaderboard
added leaderboard