largely working on server
pre-merge
pre-merge fix
Merge branch 'master' of https://github.com/jgreener64/dockit