Nothing changed. Could not pull new data b/c of Data/Thumbs.db. Told to
commit.
Merge branch 'master' of https://github.com/kaplanme/MASA-Aerodynamics

Conflicts:
	Data/Thumbs.db