modify
Merge branch 'master' of https://github.com/boolgom/Troll-of-Lengends

Conflicts:
	trolloflegends/trolloflegends/apps/troll/views.py