server 3:30
Merged
Stuff
server commit 4:06
Attempting gitignore