Change yapp.js to hr.js
Merge branch 'master' of https://github.com/SamyPesse/tv.js

Conflicts:
	Makefile