Acties worden nu correct getoond
Merge pull request #2 from KamilLaga/master

Acties worden nu correct getoond
Merge pull request #2 from StijnVA/master

Acties van Kamil
Merge pull request #1 from wimb/master

Acties
Merge pull request #1 from wimb/master

Acties
wijziging aan de pom
tijdelijke test

MySQL en Tomcat7 werkende
Merge pull request #1 from wimb/master

Acties
Merge branch 'master' of https://github.com/StijnVA/JavaMUD
Merge https://github.com/BouwenJ/JavaMUD into workJens
Merge https://github.com/ChiCNg/JavaMUD
Merge https://github.com/SteveVanReeth/JavaMUD
pom.xml final
Merge branch 'master' of https://github.com/SteveVanReeth/JavaMUD
Merge https://github.com/ChiCNg/JavaMUD
Conflict in pom.xml opgelost