Add stock app and payment gateways
Merge branch 'master' of github.com:christhekeele/Splurge

Conflicts:
	rails/Gemfile
	rails/lib/tasks/rebuild.rake
	rails/public/spree/products/1004/large/apache_baseball.png
	rails/public/spree/products/1004/mini/apache_baseball.png
	rails/public/spree/products/1004/product/apache_baseball.png
	rails/public/spree/products/1004/small/apache_baseball.png
	rails/public/spree/products/1008/large/ruby_baseball.png
	rails/public/spree/products/1008/mini/ruby_baseball.png
	rails/public/spree/products/1008/product/ruby_baseball.png
	rails/public/spree/products/1008/small/ruby_baseball.png
	rails/public/spree/products/1009/large/ror_baseball_jersey_green.png
	rails/public/spree/products/1009/mini/ror_baseball_jersey_green.png
	rails/public/spree/products/1009/product/ror_baseball_jersey_green.png
	rails/public/spree/products/1009/small/ror_baseball_jersey_green.png
	rails/public/spree/products/1010/large/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1010/mini/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1010/product/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1010/small/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1011/large/ror_baseball_jersey_green.png
	rails/public/spree/products/1011/mini/ror_baseball_jersey_green.png
	rails/public/spree/products/1011/product/ror_baseball_jersey_green.png
	rails/public/spree/products/1011/small/ror_baseball_jersey_green.png
	rails/public/spree/products/1012/large/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1012/mini/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1012/product/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1012/small/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1013/large/ror_baseball_jersey_green.png
	rails/public/spree/products/1013/mini/ror_baseball_jersey_green.png
	rails/public/spree/products/1013/product/ror_baseball_jersey_green.png
	rails/public/spree/products/1013/small/ror_baseball_jersey_green.png
	rails/public/spree/products/1014/large/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1014/mini/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1014/product/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1014/small/ror_baseball_jersey_back_green.png
	rails/public/spree/products/1015/large/ror_baseball_jersey_blue.png
	rails/public/spree/products/1015/mini/ror_baseball_jersey_blue.png
	rails/public/spree/products/1015/product/ror_baseball_jersey_blue.png
	rails/public/spree/products/1015/small/ror_baseball_jersey_blue.png
	rails/public/spree/products/1016/large/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1016/mini/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1016/product/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1016/small/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1017/large/ror_baseball_jersey_blue.png
	rails/public/spree/products/1017/mini/ror_baseball_jersey_blue.png
	rails/public/spree/products/1017/product/ror_baseball_jersey_blue.png
	rails/public/spree/products/1017/small/ror_baseball_jersey_blue.png
	rails/public/spree/products/1018/large/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1018/mini/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1018/product/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1018/small/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1019/large/ror_baseball_jersey_blue.png
	rails/public/spree/products/1019/mini/ror_baseball_jersey_blue.png
	rails/public/spree/products/1019/product/ror_baseball_jersey_blue.png
	rails/public/spree/products/1019/small/ror_baseball_jersey_blue.png
	rails/public/spree/products/1020/large/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1020/mini/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1020/product/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1020/small/ror_baseball_jersey_back_blue.png
	rails/public/spree/products/1021/large/ror_baseball_jersey_red.png
	rails/public/spree/products/1021/mini/ror_baseball_jersey_red.png
	rails/public/spree/products/1021/product/ror_baseball_jersey_red.png
	rails/public/spree/products/1021/small/ror_baseball_jersey_red.png
	rails/public/spree/products/1022/large/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1022/mini/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1022/product/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1022/small/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1023/large/ror_baseball_jersey_red.png
	rails/public/spree/products/1023/mini/ror_baseball_jersey_red.png
	rails/public/spree/products/1023/product/ror_baseball_jersey_red.png
	rails/public/spree/products/1023/small/ror_baseball_jersey_red.png
	rails/public/spree/products/1024/large/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1024/mini/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1024/product/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1024/small/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1025/large/ror_baseball_jersey_red.png
	rails/public/spree/products/1025/mini/ror_baseball_jersey_red.png
	rails/public/spree/products/1025/product/ror_baseball_jersey_red.png
	rails/public/spree/products/1025/small/ror_baseball_jersey_red.png
	rails/public/spree/products/1026/large/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1026/mini/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1026/product/ror_baseball_jersey_back_red.png
	rails/public/spree/products/1026/small/ror_baseball_jersey_back_red.png