add docker
add idea files
Merge branch 'master' of https://github.com/simonpatrick/stepbystep

Conflicts:
	.idea/workspace.xml
remove folder name
submit changes
Merge branch 'master' of https://github.com/simonpatrick/stepbystep
add files