Cleaned up folders and added audio.js to lib
Merge branch 'master' of github.com:ECSE428Group/media-stream

Conflicts:
	media-site/client/lib/videojs/my_video.js
	media-site/client/main.js