Added feature 2
Fixed bug on feature 2
Change in requirement
Merge remote-tracking branch 'Test1/master' into Feature2

Conflicts:
	src/classes/MyApexClass.cls
Merge pull request #2 from mikepaisner/Feature2

Feature2