Idunnowhat I did, but it's so bad I'm remaking bot
Merge branch 'master' of http://github.com/AlissaSquared/Archimedes