model package
User.java

Added user model
blabla

lawl
User

User model
PatientUser

PatientUser model
TherapistUser

TherapistUser model
Hibernate xml
problem?
Merge remote-tracking branch 'origin/Jeroen'
Merge branch 'master' of https://github.com/duytrann/HipperTeam4

Conflicts:
	HipperEnterprise/src/java/models/User.java
Find veranderd in Read, moest van Tomas.... ): En online database
model.user veranderd naar models.user
hibernate config xml file
Merge remote-tracking branch 'origin/tom'
merge
ignore
Ignore libraries
Revert "ignore"

This reverts commit f260d4eb037bbeafdba48dc18e012208e7342b95.
Revert "Ignore libraries"

This reverts commit 5cc48238f7308bf538406989905a5db6d764578d.
Merge branch 'master' of github.com:duytrann/HipperTeam4