commit
Revert "commit"

This reverts commit c172867563ab76ebc495d3891a6a5e64feaae6b2.
Update .gitignore
add .gitignore file
Merge branch 'master' of https://github.com/kocur/CrazyBaloons

Conflicts:
	.gitignore
	modified:   .gitignore
	new file:   bar
	new file:   foo
	deleted:    foo
	deleted:    foo
.ignore is working now
Update .gitignore
it will be work now....
Merge branch 'master' of https://github.com/kocur/CrazyBaloons
Merge branch 'master' of https://github.com/kocur/CrazyBaloons