add state
Merge branch 'master' of github.com:iritmalka/braindj

Conflicts:
	braindj/home.html
	braindj/views.py
	braindj/views.pyc