explosion
Merge branch 'master' of https://github.com/chooper9/cs354r-assignment4

Conflicts:
	config.log
	libtool
Merge branch 'master' of https://github.com/chooper9/cs354r-assignment4

Conflicts:
	Makefile
	config.log
	config.status
explosion