huh?
Merge branch 'master' of https://github.com/NorfairKing/OCD_Man

Conflicts:
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml