added routes coffee file to src
Merge branch 'master' of github.com:JulianGindi/there
added socket.io dependency and basic socketio file
updated gruntfile and added social.coffee
Merge branch 'web_rtc' of github.com:JulianGindi/there into web_rtc

Conflicts:
	Gruntfile.js
	app.coffee
	app.js
	package.json
	src/js/test.coffee
working on video
Merge branch 'web_rtc' of github.com:JulianGindi/there into web_rtc

Conflicts:
	Gruntfile.js
	static/index.html
	static/js/app.js
updated client js to coffee