Added includes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/obj/ece353_base_project.build_log.htm