dont' know what changes these are, but git wants me to commit them before pulling
Merge branch 'master' of github.com:zmcgint2/ece290

Conflicts:
	project1/project1_lib/hds/.cache.dat
shift back to ascii from 1-26