Major changes to everything. Links work.
Merge branch 'master' of https://github.com/Jamato-sUn/TestServerApp