a
Merge branch 'master' of https://github.com/nburow/ece695

Conflicts:
	Makefile