Changes

4/7/14
Merge branch 'master' of https://github.com/Arlingtongit/Midterm

Conflicts:
	Schedule.html
	Session.html
	Videos.html
	index.html
	speaker.html
Changes

4/7/14
Changes

4/7/14