attempts to scroll using marquee
local webapp2
commit before merge
/api json endpoint
data files
Merge branch 'master' of https://github.com/sonph/hacktxf14

Conflicts:
	templates/index.html
Merge branch 'files' of https://github.com/sonph/hacktxf14
style and script for vticker