# Conflicts:
#	package.json

# Conflicts:
#	src/input-mappings.js

# Conflicts:
#	src/room.html

Feature/robot hand gestures

Merge branch 'feature/robot-hand-gestures' of ssh://github.com/robertlong/social-vr-demo into feature/robot-hand-gestures

Fix networked video component

# Conflicts:
#	src/room.js

Progressively load assets on mobile/desktop

Inflate components

Merge branch 'bug/networked-video' of https://github.com/mozilla/mr-social-client into bug/networked-video