initial commit
adding niosi
pushing img + css
Checking in Jude's branch and fixing some things
Merge branch 'jude-niosi/jude'

Conflicts:
	index.html
Adding geoff folder
Merge branch 'shaneskinner'
Merge pull request #12 from EasternCTWD/shaneskinner

Shaneskinner
Merge branch 'geoff' of github.com:geoffhasson/talks-may14 into geoffhasson-geoff
Merge branch 'geoffhasson-geoff'
Merge pull request #13 from geoffhasson/geoff

Adding geoff folder
added Geoff to the nav
updating my index.html
Merge remote-tracking branch 'origin'
Updated my page.
Merge branch 'jaym'
Merge pull request #15 from EasternCTWD/shaneskinner

Additions
Merge branch 'shaneskinner'

Conflicts:
	shaneskinner/index.html