pute 2
Merge branch 'master' of github.com:bjornagain/game

Conflicts:
	main/models.py
	main/models.pyc
	main/views.py
	main/views.pyc
update textfield
Save to textfield, needs updated home template to load archive
Merge branch 'master' of github.com:bjornagain/game
ff
Conflicts:
	main/views.pyc