DONE!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	examples/comp_tut.md