ignore some stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	rate/views.py
ignore some stuff
test