MergeCrap
Revert "MergeCrap"

This reverts commit 569c2a9471bc51e7fcd548a68d18276ef5117dbc.
Merge branch 'master' of https://github.com/SaratogaEDD2014/RapidPrototyper