In the beginning
Initiate
Merge branch 'master' of https://github.com/bahrus/teaspoon

Conflicts:
	.gitignore