Not sure where the conflict is
Merge branch 'master' of https://github.com/phookajoe/RG2Remote

Conflicts:
	assets/css/custom.css