add column charged_was_made to orders - Money refunded
update style
order twitter before pull
Merge branch 'master' of https://github.com/Dvporg/sneakers

Conflicts:
	twitter.rb
updated admin-dms index