for the purpose of pulling new data
Merge branch 'master' of https://github.com/cristy95/ATRrepo

Conflicts:
	javascript/globs.js
	scripts/dosql.py~
	scripts/gethonorstudents.py
	scripts/gethonstudperid.py

"fixed problem"
fixed problem
fixing problem
fixing problem
fixing problems