Can now add rules
Merge branch 'master' of https://github.com/Haval/codechallenge

Conflicts:
	cc/apps/challenge/views.py
Merge branch 'master' of https://github.com/mavroskardia/codechallenge
Merging parent changes
Modified create view
Added ability to leave challenge
Merge pull request #9 from Haval/master

Can now add a rule when creating a challenge