forcing me to commit changes
Merge branch 'master' of https://github.com/advice/PHYS-202-S13

Conflicts:
	Week7/QuadraticDrag.nb