First commit
Merge branch 'master' of github.com:tuxskar/caluma

Conflicts:
	.gitignore