User interface
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2