ooops
Merge branch 'master' of https://github.com/ram1res/not_bad_informant

Conflicts:
	tosterproject/toster/urls.py
	tosterproject/toster/views.py