Wave merge

Add Shock tube notebook (assignment background) to master