Added D1 and D2.
Merge origin/master

Conflicts:
	robotFiles/PositionLookupTable.txt