Aux files updated
If statements
Java files updated
Merge branch 'master' of https://github.com/JoostvDoorn/VertalerbouwEindproject