initial commit
Merge branch 'master' of github.com:miguelbermudez/octoflow

Conflicts:
	.gitignore