fixed just about everything
Merge branch 'master' of https://github.com/JoshSB/reveltest

foo
added variables to template