blah
Merge branch 'master' of https://github.com/rafii6312/explochem

Conflicts:
	.gradle/2.0/taskArtifacts/cache.properties.lock
	.gradle/2.0/taskArtifacts/fileHashes.bin
	.gradle/2.0/taskArtifacts/fileSnapshots.bin
	.gradle/2.0/taskArtifacts/taskArtifacts.bin
	.gradle/gradle.log
	.settings/org.eclipse.jdt.core.prefs
	eclipse/.metadata/.log
	eclipse/.metadata/.mylyn/.tasks.xml.zip
	eclipse/.metadata/.mylyn/tasks.xml.zip
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	eclipse/.metadata/version.ini

123