delete if
Merge branch 'schpuntik' of github.com:OpenAR-P/tdt-arp into schpuntik