Merged
Diff tools didn't work
Don't forget the files
Merge branch 'logic_impl' into dev

Conflicts:
	MineFlags/MineFlags.csproj