Merge pull request #29 from jasonalmaturner/master

moved server stuff into server-assets folder for neatness purposes