Merge Fix!
Gitignore
Merge branch 'master' of https://github.com/krkn/sote

Conflicts:
	bin/sote