First commit with base stuff
Merge branch 'master' of github.com:ikame/automaton

Conflicts:
	.gitignore
First commit