first commit
added stripe
Merge https://github.com/twillw/selfstarter

Conflicts:
	.gitignore
	.rspec
	Gemfile
	Gemfile.lock
	LICENSE
	Procfile
	README.md
	Rakefile
	app/assets/images/1-background.png
	app/assets/images/2-background.png
	app/assets/images/3-background.png
	app/assets/images/4-background.png
	app/assets/images/background.png
	app/assets/images/bullet.png
	app/assets/images/rails.png
	app/assets/images/video_placeholder.png
	app/assets/javascripts/application.js
	app/assets/javascripts/jquery.details.js
	app/assets/javascripts/jquery.textchange.js
	app/assets/javascripts/preorder.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/checkout.css.scss
	app/assets/stylesheets/footer.css.scss
	app/assets/stylesheets/header.css.scss
	app/assets/stylesheets/homepage.css.scss
	app/assets/stylesheets/homepage/call_to_action.css.scss
	app/assets/stylesheets/homepage/faq.css.scss
	app/assets/stylesheets/homepage/key_points.css.scss
	app/assets/stylesheets/homepage/other_points.css.scss
	app/assets/stylesheets/homepage/press.css.scss
	app/assets/stylesheets/homepage/stats.css.scss
	app/assets/stylesheets/main.css.scss
	app/assets/stylesheets/preorder.css.scss
	app/assets/stylesheets/primitives.css.scss
	app/assets/stylesheets/reset.css
	app/assets/stylesheets/share.css.scss
	app/assets/stylesheets/variables.css.scss
	app/controllers/application_controller.rb
	app/controllers/preorder_controller.rb
	app/helpers/application_helper.rb
	app/helpers/preorder_helper.rb
	app/mailers/.gitkeep
	app/models/.gitkeep
	app/models/order.rb
	app/models/payment_option.rb
	app/models/user.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/application.html.erb
	app/views/preorder/_copyright.html.erb
	app/views/preorder/_footer.html.erb
	app/views/preorder/_google_analytics.html.erb
	app/views/preorder/_header.html.erb
	app/views/preorder/_payment_options.html.erb
	app/views/preorder/checkout.html.erb
	app/views/preorder/checkout/_sidebar.html.erb
	app/views/preorder/homepage/_faqs.html.erb
	app/views/preorder/homepage/_key_points.html.erb
	app/views/preorder/homepage/_middle_reserve.html.erb
	app/views/preorder/homepage/_other_points.html.erb
	app/views/preorder/homepage/_press.html.erb
	app/views/preorder/homepage/_show_dont_tell.html.erb
	app/views/preorder/homepage/_stats.html.erb
	app/views/preorder/homepage/_value_proposition.html.erb
	app/views/preorder/index.html.erb
	app/views/preorder/share.html.erb
	app/views/preorder/share/_facebook_js.html.erb
	app/views/preorder/share/_twitter_js.html.erb
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/amazon_flexible_payments.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/rails_config.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	config/settings.yml
	config/settings/development.yml
	config/settings/production.yml
	config/settings/test.yml
	db/migrate/20121004072615_create_users.rb
	db/migrate/20121004072706_create_orders.rb
	db/migrate/20130106183354_create_payment_options.rb
	db/migrate/20130107010733_add_payment_option_id_to_orders.rb
	db/schema.rb
	db/seeds.rb
	doc/README_FOR_APP
	lib/assets/.gitkeep
	lib/tasks/.gitkeep
	log/.gitkeep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/robots.txt
	spec/controllers/preorder_controller_spec.rb
	spec/fixtures/orders.yml
	spec/fixtures/users.yml
	spec/models/order_spec.rb
	spec/models/payment_option_spec.rb
	spec/models/user_spec.rb
	spec/spec_helper.rb
	vendor/assets/javascripts/.gitkeep
	vendor/assets/stylesheets/.gitkeep
	vendor/plugins/.gitkeep
added stripe