wtf
Merge branch 'master' of github.com:kingod180/snap

Conflicts:
	snapApp/snap1/__init__.pyc