add all of leo's code and junk
Merge branch 'master' of https://github.com/PiJoules/website