Merge pull request #8 from darkfadr/staging

Staging
updated views on events... event info
Merge branch 'master' of https://github.com/darkfadr/upme into content

Commit merge
updated event logic; fixed ifs; added content for hotels and flights
Updated upgrades page
Merge pull request #9 from darkfadr/content

Content