add index.html
add display
Merge branch 'master' of github.com:udaraau/git_sandbox

Conflicts:
	index.html