timing and animations done, just got to make it look pretty now
Merge branch 'master' of https://github.com/jbcon/Promotion
Merge branch 'master' of https://github.com/jbcon/Promotion