Branch initialization commit
Create README.md
Test Commit from IntelliJ
Merge remote-tracking branch 'origin/RAO_Feature_GUI' into RAO_Feature_GUI
Merge remote-tracking branch 'origin/master' into RAO_Feature_GUI
Merge remote-tracking branch 'origin/master' into RAO_Feature_GUI

Conflicts:
	Rekening_Administratie/web/index.jsp
user service
Merge remote-tracking branch 'origin/master' into RAO_Feature_GUI
Readded project
Add login functionality
Test commit
Make sure the glass fish works
test
Merge remote-tracking branch 'origin/master' into RAO_Feature_GUI

Conflicts:
	.idea/artifacts/Rekening_Administratie_Overheid_ear_exploded.xml
	.idea/misc.xml
	.idea/modules.xml
	AutoSysteem/AutoSysteem.iml
	AutoSysteem/out/artifacts/web_war_exploded/WEB-INF/beans.xml
	AutoSysteem/web/WEB-INF/web.xml
	Rekening_Administratie/Rekening_Administratie.iml
	Rekening_Administratie/web/WEB-INF/beans.xml
	Rekening_Administratie/web/WEB-INF/web.xml
	Rekening_Administratie_Overheid/Rekening_Administratie_Overheid.iml
	Rekening_Administratie_Overheid/web/WEB-INF/faces-config.xml
	Rekening_Administratie_Overheid/web/WEB-INF/web.xml
	Rekeningrijders_Website/.idea/workspace.xml
	out/artifacts/Rekening_Administratie_Overheid_war_exploded/WEB-INF/beans.xml
	out/artifacts/Rekening_Administratie_Overheid_war_exploded/index.xhtml
Merge pull request #4 from PTS-S61E/RAO_Feature_GUI

RAO - Feature - GUI