Merge branch 'master' of https://github.com/Aristide1o/CMUSV_SE_Practicum_2013

Conflicts:
	test_harness/self-timing test suite.zip
Merge branch 'master' of https://github.com/Aristide1o/CMUSV_SE_Practicum_2013

Conflicts:
	test_harness/self-timing test suite.zip