battery dying almost done implementing auto scroll!!
Merge https://github.com/sexypirate604/cs410

Conflicts:
	view/html/main.js