amos
as
Merge branch 'master' of https://github.com/chascasvarias/pay_git

Conflicts:
	index.html