bla
Merge branch 'master' of github.com:zmcgint2/ece290

Conflicts:
	project1/project1_lib/hds/.cache.dat
	project1/project1_lib/work/@_opt1/_deps
	project1/project1_lib/work/@_opt2/_deps
	project1/project1_lib/work/_info
	project1/project1_lib/work/add_97_lowercase_shift/_primary.dat
	project1/project1_lib/work/add_97_lowercase_shift/_primary.dbs
	project1/project1_lib/work/add_97_lowercase_shift/struct.dat
	project1/project1_lib/work/add_97_lowercase_shift/struct.dbs
	project1/project1_lib/work/transcript.txt
	project1/project1_lib/work/vsim.wlf
commit before pull....again
qwqweqwregedsrwe
 zach's cipher works so far. doing more testing.