Merge branch 'master' of D:\INF3\Project\groepH with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Recover password updates
Merge remote-tracking branch 'origin/master'
26/02/2012: Password recovery