Did stuff (Petar)
time status
pew
Merge branch 'master' of https://github.com/lfendy/get-a-room

Conflicts:
	public/map.html
Merge branch 'master' of ssh://git:7999/sbx/get-a-room
last minute changes