initial commit
Merge branch 'master' of github.com:shamsulsham89/active_merchant_rails3.2

Conflicts:
	config/environments/production.rb
	config/environments/test.rb