Server info added
Server info
Fixed conflicts
fixed readme
formatting on readme
formatting again
formatting again
Merge branch 'dbInit'
Merge branch 'dbInit'
Merge branch 'dbInit'
Merge branch 'dbInit'
message
merge
added interface
Merge branch 'davebarks'
added populateUI script