local diffs
merge + buggy not working movement in cpp

Conflicts:
	class/playground.R