adding energy equation
Merge branch 'master' of https://github.com/samtormey/RecycleRobot

Conflicts:
	presentation/Julia Slides.log
	presentation/RoboPresentation.log
	presentation/RoboPresentation.pdf
	presentation/RoboPresentation.synctex.gz