pre-release
Merge branch 'master' of github.com:hajder/bubbles

Conflicts:
	.gitignore