Preparing the site for tickets to go on sale
Fixed merge issue
Merge pull request #44 from jrstarke/master

Preparing site for tickets to go on sale