awse
Merge branch 'master' of https://github.com/iraklisg/edx.git

Conflicts:
	edx600x/L12_Plotting/L12_3_more_on_pylab_plotting.py