merge
Merge branch 'master' of https://github.com/wur911/Engr40C_milestone2

Conflicts:
	channel_coding.pyc
	generate_graphs.sh