init
first commit
Merge github.com:johnfkraus/react-starter-video-player

Conflicts:
	.gitignore
	index.html
	package.json
	server.js
conflicts in pull
unconflicted server