Neeearly done with paypal. rest tomorrow
Fuck git

Conflicts:
	json/getPaypalUrl.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	json/getPaypalUrl.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	json/getPaypalUrl.php