Made the title a little less obscene and corrected button names
Merge branch 'master' of https://github.com/jbcon/Promotion