deleted getId in User
Merge branch 'master' of github.com:VitoInfinito/codedark

Conflicts:
	src/main/java/core/User.java