checking changes
checking again
fixed conflict

Conflicts:
	pages/views.py