blah
Merge remote-tracking branch 'origin/master'
got basic server up