merge
merge
merge
Merge branch 'groep_acht' of github.com:v1kko/SWE_2013_Groep2 into groep_acht
Merge branch 'groep_acht' of github.com:v1kko/SWE_2013_Groep2 into groep_acht
remove tags added
utf8 encoding and unix eol
Comment model added
fixed some issues with one() throwing NoResultFound exceptions
Now working review thingy
Merge branch 'groep_acht' of github:v1kko/SWE_2013_Groep2 into groep_acht
Victor you fool!
textarea added to template
fixed empty textarea bug
Merge branch 'groep_acht'

Conflicts:
	models/basemodel.py
	templates/assigntag.html
	templates/index.html
Fix database locked error in unittests
Fix trailing whitespace
Fix merge conflict
added review functionality
Merge branch 'master' of github:v1kko/SWE_2013_Groep2