THE FINAL COPY ISH
Merge branch 'master' of https://github.com/EliotNevill/teleprompterhack

Conflicts:
	views/scroll.erb