Fixing a typo noticed by dave
Adding petes idae for a second joke
Closing call for speakers
Merge branch 'master' of github.com:jaredwy/jsconfau2014

Conflicts:
	public/data/players.js
	public/index.html
	public/style/sheet.css
Merge branch 'master' of github.com:jaredwy/jsconfau2014

Conflicts:
	public/index.html
Merge branch 'master' of github.com:jaredwy/jsconfau2014
adding two speakers