Merge branch 'master' of /home/test/amanaman/amanaman with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	AmanamanProjekt/settings.py
	Evaluation/templates/evaluation.html
	Evaluation/views.py
Merge remote-tracking branch 'origin/master'
renaming stack to tasks;