prototype
server client start
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Class.java
FUCK ITTTTT
Merge remote-tracking branch 'origin/proto'