Oculus Rift
Merge branch 'master' of https://github.com/masteranza/public

Conflicts:
	Things I'd like to receive.md