Merge with latest changes.
Merge branch 'master' of github.com:Hansenq/nere

Conflicts:
	public/javascripts/index.js
t
Merge branch 'master' of github.com:Hansenq/nere

Conflicts:
	views/index.jade
added a meta tag to prepare for optimization for mobile
Finished getNearbyRooms function in app.js
Merge branch 'master' into experiment
merged in the Get nearby rooms method in app.js
Fixed bugs in Display Nearby Rooms
fixed the room name input; syncing across branches