More changes
Merge branch 'master' of https://github.com/michaellin/ee105miniproj

Conflicts:
	EE105MiniProj.aux
	EE105MiniProj.log
	EE105MiniProj.pdf