challenge files
Merge branch 'master' of https://github.com/DennyScott/teamAvatar into Dierckens

Conflicts:
	app/templates/challenge.html
Merge pull request #5 from DennyScott/Dierckens

Dierckens