hopefully removing layout
Merge branch 'master' of https://github.com/alpha7bravo/CS372_assn4

Conflicts:
	src/BrownAlphonse-assn4.layout