Added a new file for testing media classes; added this file to the run_tests script
Merge branch 'develop' of github.com:Pshriwise/CS638 into develop

Conflicts:
	tests/run_tests