Test 2 commas
Merge remote-tracking branch 'origin/master'

Conflicts:
	Object-Oriented
Programming/Defining-Classes-Part-I/MobilePhoneDevice/BatteryType.cs