Added proxy, stopped derping
Merge branch 'master' of https://github.com/Pentachoron-Labs/SBFP-Tech