Merge branch 'angular' into gh-pages
testing angular
Merge branch 'angular' into gh-pages
.
angular test
re-added jquery
Merge branch 'gh-pages'

Conflicts:
	index.html
	script.js