uploadify
photo
Problems with images
Problems with images
Problems with images
Problems with images
Problems with images
Problems with images
keep up to date
Merge branch 'ben_media_database' of E:\Aibek\My homework\Fall 2013\CS 326\3Dwe\radio-clean with conflicts.
updates and fixes
minor fix
Video options & recording
more photo animation
Video options & recording
Merge remote-tracking branch 'origin/ben_media_database' into ben_media_database

Conflicts:
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/CL.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/CL.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/cl.command.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link-cvtres.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link-cvtres.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link-rc.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link-rc.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link.command.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/CL.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/CL.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/cl.command.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link-cvtres.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link-cvtres.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link-rc.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link-rc.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link.command.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link.write.1.tlog
	public/javascripts/bookScene.js
	public/javascripts/roomScene.js
	public/javascripts/sidemenu.js
	public/javascripts/webgl_core.js
Video options & recording
Merge branch 'ben_media_database'

Conflicts:
	app.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/CL.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/CL.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/cl.command.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link-cvtres.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link-cvtres.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link-rc.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link-rc.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link.command.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/bufferutil/link.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/CL.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/CL.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/cl.command.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link-cvtres.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link-cvtres.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link-rc.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link-rc.write.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link.command.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link.read.1.tlog
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj/validation/link.write.1.tlog
	public/javascripts/TVScene.js
	public/javascripts/bookScene.js
	public/javascripts/jukeBoxScene.js
	public/javascripts/sampleScene.js
	public/javascripts/sidemenu.js
	public/javascripts/webgl_core.js
	public/libs/three.min.js
	public/libs/threex.windowresize.js
	public/stylesheets/style.css
	routes/index.js
	views/footer.ejs
	views/header.ejs
	views/main.ejs
	views/sidemenu.ejs
Merge branch 'sean_media_interface'

Conflicts:
	public/javascripts/sidemenu.js
	public/javascripts/webgl_core.js
	public/stylesheets/options_style.css
	views/TV_options.ejs
	views/header.ejs
	views/main.ejs
Integrated everything in the room