initial import
Merge branch 'master' of github.com:ipf/gsflow

Conflicts:
	.gitignore