Merge pull request #1 from burhans/master

Update 1
Merge pull request #2 from burhans/master

Fixed year in conference.html
Merge pull request #3 from burhans/master

6apr2013
Merge pull request #4 from burhans/master

take 3
Merge pull request #5 from burhans/master

3 for realz
Merge pull request #6 from burhans/master

26may2013
Merge pull request #1 from cmhcodecamp/master

19aug and stuff