trying to get migrations working on heroku
Merge branch 'master' of https://github.com/BrwnSuperman/PluFund

Conflicts:
	db/schema.rb
	db/structure.sql
Add Amazon Flex Pay gem and retrieve a redirect URL for payment in test
ignore some files that should not be in git