list tasks
list tasks
solutions listing
listing solutions 2
Merge branch 'master' of
https://github.com/fmi-nasko/HomeworkManager.git

Conflicts:
	HomeworkManager/WebContent/admin/index.jsp