practice
Merge branch 'kyle'

Conflicts:
	core/views.py
second