I have no idea what im doing >views<
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/views.py