* conference shedule
* conference shedule part 2
* wtf?
* conference shedule main
merge
Merge branch 'master' of https://github.com/openconf/cityjs
some syntax changes
Merge pull request #4 from mrChex/master

Schedule and wtf