created bit of a file structure for the new proxy
incomplete proxy server
merge conflict resolution
URL parsing in proxy
Merge branch 'master' of https://github.com/NAlpha/ncs
Made proxy, but libraries don't work
Merge branch 'master' of https://github.com/NAlpha/ncs