implemented conditions check
Merge branch 'master' of github.com:MeetMagentoNY/Hackathon_PromoCodeMessages