Adding sass
Merge branch 'master' of github.com:davehubler/locke

Conflicts:
	Gemfile
	Gemfile.lock
More Stripe
Merge branch 'master' of github.com:davehubler/locke
Merge branch 'refs/heads/development'