Merge branch 'master' of github.com:trvrfrd/trvrgur

Conflicts:
	README.md
Merge branch 'master' of github.com:trvrfrd/trvrgur

Conflicts:
	README.md