test1: c1
test1: c2

Conflicts:

	polls/tests.py
c3
c4
Merge branch 'feature/features' into develop