Merge branch 'master' of github.com:artpropeller/tb_courses

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of github.com:artpropeller/tb_courses