Updated gitignore again
Fixed code style
Minor changes
Style changes
Fixed small bugs in server
Added Makefile