trying to merge
Merge branch 'master' of https://github.com/bgun/sharepay

Conflicts:
	public/index.html
Merge branch 'master' of https://github.com/bgun/sharepay