gitignore
Merge branch 'master' of https://github.com/mwong56/WayPal

Conflicts:
	.gitignore