fixed some broken markup
Merge branch 'master' of github.com:softprops/northeast-scala-symposium

Conflicts:
	src/main/scala/nyc2014/Schedule.scala