initial import
initial import
Merge branch 'master' of https://github.com/hanscappelle/so-2250770

* 'master' of https://github.com/hanscappelle/so-2250770:
  Initial commit

Conflicts:
	.gitignore
init