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

Conflicts:
	.idea/workspace.xml