actually fixed whitespace issue this time
Merge branch 'master' of git://github.com/cse-revue/rms
Merge branch 'master' of git://github.com/cse-revue/rms
Merge branch 'master' of git://github.com/cse-revue/rms
Merge branch 'master' of git://github.com/cse-revue/rms
Merge branch 'master' of git://github.com/cse-revue/rms
Merge branch 'master' of git://github.com/cse-revue/rms
Merge branch 'master' of git://github.com/cse-revue/rms
Merge branch 'master' of git://github.com/cse-revue/rms
added payment advice to the merch ordering page
added payment advice to the view-orders and show pages