go!
gauges tracking
adding Event Handler
Merge branch 'gh-pages' of https://github.com/janl/waaa into gh-pages
Add link to RubyThere for more CFPs
Add twilio conference CFP
Add link to Nancy Duarte's TEDx talk
Merge pull request #2 from kytrinyx/more-resources

More resources
Merge pull request #1 from fronx/gh-pages

fixed some typos and word omissions
added bogotaconf
Adding jsconf.au
Merge pull request #6 from jaredwy/57862da4c4ad02f0ae1b3d77d5dc805fe4fc82f8

Done and done
make a link in the header to the root of the site
fix also the other stylesheets
few confs with cfp added
Merge pull request #7 from marcelinollano/gh-pages

Link to the root of the site
Merge pull request #8 from karolinaszczur/gh-pages

New cfps
Merge branch 'gh-pages' of https://github.com/janl/waaa into gh-pages
some rearranging and cleanup
Merge branch 'gh-pages' of git://github.com/Buritica/waaa into gh-pages

Conflicts:
	_posts/2012-06-13-conferences-with-open-cfps.md