really not sure what i changed here. working on other things
removed old angular.js (was asdf.js)
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