Merge branch 'master' of https://github.com/cportillo/vrwa

Conflicts:
	README.md