I need to submit this to sync
Merge branch 'master' of https://github.com/AdventureofDragons/AdventureofDragons

Conflicts:
	Source/.metadata/.log
	Source/.metadata/.plugins/org.eclipse.core.resources/.projects/AdventureOfDragonsLauncher/org.eclipse.jdt.core/state.dat
	Source/.metadata/.plugins/org.eclipse.core.resources/.projects/DragonEditor/org.eclipse.jdt.core/state.dat
	Source/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Source/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Source/.metadata/.plugins/org.eclipse.jdt.core/2811624470.index
	Source/.metadata/.plugins/org.eclipse.jdt.core/3524245249.index
	Source/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Source/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	Source/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
Merge branch 'master' of https://github.com/AdventureofDragons/AdventureofDragons

Conflicts:
	Source/.metadata/.log

	Source/.metadata/.plugins/org.eclipse.core.resources/.projects/AdventureOfDragonsLauncher/org.eclipse.jdt.core/state.dat

	Source/.metadata/.plugins/org.eclipse.core.resources/.projects/DragonEditor/org.eclipse.jdt.core/state.dat

	Source/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Source/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Source/.metadata/.plugins/org.eclipse.jdt.core/2811624470.index
	Source/.metadata/.plugins/org.eclipse.jdt.core/3524245249.index
	Source/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Source/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

	Source/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat