first commit
second commit
Merge branch 'gh-pages'

Conflicts:
	js/main.js
updates js
updates index.html
updates Readme
updates readme
updates readme
adds content to index.html