Added a location.js file to deal with all location based requests, added a system to manage rooms in app.js, added a few socket.io calls for changing rooms and dealing with roomIds /unfinished
debugging with ray
Merge branch 'master' of github.com:Hansenq/nere

Conflicts:
	app.js

made merge
Added changes to the location stuff
Updated layout.
final adjustments to raw code?
Minor layout changes.
Location-based rooms *should* be working
Merge branch 'location' into experiment

Conflicts:
	app.js
	public/javascripts/index.js
	views/index.jade

fixed merge errors
smaller merge conflicts
fixed other room bugs with location
made working modifications to location.js. Still sometimes getting timeout error
.
Merge branch 'master' of github.com:Hansenq/nere

merge necessary to merge location to this branch
:x
started using getCurrentPosition instead!
Merge branch 'experiment'

Added current location code to current release