fixed master
Merge branch 'gh-pages'

Conflicts:
	index.html
	script.js
Merge branch 'gh-pages'

Conflicts:
	index.html
	script.js
updated to use angular
Merge branch 'gh-pages'
Merge branch 'gh-pages'
Merge branch 'gh-pages'
fixed crazy loop issues
Merge branch 'master' into gh-pages