sams
Merge branch 'master' of https://github.com/samgdf/FindLove

Conflicts:
	reg.html