first commit
Merge branch 'master' of github.com:mrrrgn/influencingmachines

Conflicts:
	.gitignore