Edited README
Added to Conversions
Added to energy conversions
Merge branch 'master' of https://github.com/sanderblue/polymath

Conflicts:
	README.markdown
	src/Polymath/Conversions/Energy/Energy.php