first try
Merge branch 'master' of github.com:bjornagain/game
deletion
deletion
Merge branch 'master' of github.com:bjornagain/game
i hate git
Conflicts:
	main/content.py
	main/content.pyc
	main/templates/home.html
	main/views.py
	main/views.pyc
Final Project