add workspace
Merge branch 'master' of github.com:simonpatrick/stepbystep

Conflicts:
	.idea/workspace.xml
remove .idea folder