Signed-off-by: Pavel Czempin <p.czempin@gmx.de>
added "energy" to characters
Merge branch 'master' of https://github.com/thomas-burger/GameJam-15.2.2014

Conflicts:
	Assets/Init.cs