Initial conditions
Merge remote-tracking branch 'origin/master'

Conflicts:
	Burgers Equation Part Two.py