edited model
Merge pull request #5 from tlowe11/server

edited model