fianl sql
Merge branch 'master' of github.com:justinwm/SE-Payment

Conflicts:
	payment.sql