Initial commit
Merge branch 'master' of https://github.com/emunozh/EnergyCalculatoR

Conflicts:
	.gitignore
	deleted:    readme.txt