Test Message
Test2 Message
Merge branch 'Giinger'

Conflicts:
	src/main/java/com/domain/users/User.java
Removed Test Message
Merge branch 'Giinger'