derp commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	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.core.runtime/.settings/org.eclipse.jdt.launching.prefs

	eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml