Refactored payment_status in Order model. Shortened from 30+ lines to less than 20. Stil over 10 lines of code, but much cleaner than before.
Merge branch 'style-project-nick' into style-project

Conflicts:
	app/models/order.rb