Merge branches 'master' and 'master' of https://github.com/DigitalSarcasm/Physics
30/7/2013