Merge branch 'master' of https://github.com/lanxiang/JavaMUD
Merge branch 'master' of https://github.com/BouwenJ/JavaMUD
Merge Jens SQL
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD
sql: constraint name conflict fix
Merge pull request #27 from BouwenJ/master

sql: constraint name conflict fix
target .gitignore
HoofdMenuController
LokatieController
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD
Update hoofdmenu & lokatie
Update hoofdmenu
Hoofdmenu met HttpSession
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD
Opmerkigen toegevoegd in Item entity
Merge pull request #28 from StijnVA/master

Opmerkingen aan Item Entity
Hoofdmenu met karakterlijst
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD.git
Hoofdmenu testing
Aanpassing orm.xml