Added spoon
Merge branch 'master' of github.com:joninvski/EnergyTimes

Conflicts:
	EnergyTimes/build.gradle