got confused... keep that code
Merge pull request #4 from cjohnsonSMSH/dev-cornelius-bug-promo_remove_486

promotion remove
Merge pull request #5 from cjohnsonSMSH/sprint-2014-1-15

Sprint 2014 1 15