merge commit
Merge branch 'groep_acht' of github.com:v1kko/SWE_2013_Groep2 into groep_acht
add_tag() and remove_tag() functions