import fix
major review changes
Merge branch 'groep_acht' of github.com:v1kko/SWE_2013_Groep2 into groep_acht
scheduler should kick in when answer time ends