start with shell
Merge branch 'master' of github.com:1blankz7/presentation-shell

Conflicts:
	Makefile
	index.html
	scripts/script.js
	server.py
	test.html