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
Finished getNearbyRooms function in app.js