initial commit
Merge https://github.com/katiewsimon/jp_server_repo