trying to pull, complicated
Merge branch 'master' of https://github.com/usohi/PHYS202-S14

Conflicts:
	DataIO/DataIOSolutions.ipynb
	DataIO/messy_data.dat
Error Handling and Graphics