first commit (working)
first commit (working)
old commit
Merge branch 'current'

Conflicts:
	cocobongo/settings.pyc
yesyes