:boom::camel: Added .gitattributes & .gitignore files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/s/server.java