Changed ArrayList to List
Merge branch 'master' of https://github.com/owsm/inf3project.git