huhu
Merge branch 'master' of github.com:DDDickie/sigma

Conflicts:
	views.py