Commit to show sample code
Merge branch 'master' of https://github.com/FarrellSampleCode/EnergyTrading

Conflicts:
	README.md