init
Merge branch 'master' of github.com:aconstantin/foobar

Conflicts:
	.gitignore