oy
Merge master into Dev_3
Merge master into Dev_3
Merge master into Dev_3
Javadoc yo
Fuck Yeahhhhhhhhhhhhhhhh 
Finished Server... I think....
Merge Dev_2 into Dev_1

Conflicts:
	src/Client/Login.java
Javadoc yo 2
Merge Dev_3 into Dev_1

Conflicts:
	src/Shared/Message.java
	src/Shared/msgObjects/userData.java
Merge Dev_3 into Dev_1

Conflicts:
	src/Shared/Message.java
	src/Shared/msgObjects/userData.java
login done. onto register desu~~~~~~