Merge pull request #2 from mckays630/gh-pages

Updating schedule, miscellaneous changes
Update Etherpad link
Merge branch 'gh-pages' of https://github.com/jrherr/2014-06-26-nd into gh-pages

Conflicts:
	index.html
Merge pull request #3 from mckays630/gh-pages

Adding links to python excercises
Merge pull request #1 from jrherr/gh-pages

test