template work 1
Merge branch 'master' of github.com:jasonshapiro/shootitdown

Conflicts:
	shootitdown/shootitdown/settings.pyc
merge conflict