server getting ready for state engine
Merge branch 'master' of https://github.com/jkennedy1980/madtags