transfer from share drive @ school
Merge branch 'gh-pages' of https://github.com/jaime5x5/p2-dvr-app into gh-pages

Conflicts:
	control.html
	index.html
	mediaLibrary.html
	tvguide.html