Merge branch 'master' of https://github.com/mavroskardia/codechallenge

Conflicts:
	cc/apps/challenge/templates/challenge/challenge_detail.html
	cc/apps/challenge/templates/challenge/rules.html
Merge branch 'master' of https://github.com/mavroskardia/codechallenge
Converted entry comments to new style