add three corrections to server and move to dir
update README
temporary name change because of Git foolishness
undo temporary name change
Merge branch 'dev'