really not sure what i changed here. working on other things
removed old angular.js (was asdf.js)
Ran index.html through w3c validator, fixed issues found
Ran javascript through JSHint, fixed issues found
Merge branch 'master' into not-sure

pulling changes from master after running code through validators

Conflicts:
	index.html
set up delayed_bootstrapping in angular: Angular-1.2.9.js is working now