new file
new file
Merge branch 'master' of https://github.com/senonchen/popcans

Conflicts:
	popcans/__init__.pyc
	popcans/settings.pyc