made a jar
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/SweetApi_jar.xml
	.idea/workspace.xml
geddem build breaker
gaddem build breakers
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	SugarClient/src/com/jberry/dto/User.java
	SugarClient/src/com/jberry/services/user/UserServiceImpl.java
test push, added Id variable
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Made a Day class