login fuctions
Merge branch 'master' of https://github.com/utwente-di/di09
Merge branch 'Sprint2' of https://github.com/utwente-di/di09
Merge branch 'Sprint2' of https://github.com/utwente-di/di09
mod 4
Merge branch 'master' of https://github.com/utwente-di/di09
Werkende login mwahahah
update project
login functies svp checken op correctie!
update van het project

Login werkt bijna, er moeten nog cookies vervangen worden door sessies.
En registreren moet nog gedaan worden maar dat hoeft niet in deze sprint
Update van het project
Catalogus
sorry
Meer meuk
Sorry
Merge branch 'master' of https://github.com/utwente-di/di09
Merge branch 'Sprint2' of https://github.com/utwente-di/di09
Merge branch 'Sprint_2' of https://github.com/utwente-di/di09
Merge branch 'master' of https://github.com/utwente-di/di09

Conflicts:
	design/JavaProject/Concordia/src/main/webapp/admin/addKunstwerk.jsp
	design/JavaProject/Concordia/src/main/webapp/kunst_catalogus.jsp
	design/JavaProject/Concordia/target/m2e-wtp/web-resources/META-INF/maven/nl.utwente.di/Concordia/pom.properties
password uit txt halen kusjes mij