pulling from Tim
Merge branch 'master' of https://github.com/hackerunion/root
hooked up Kennedy's and Tim's front end
Merge branch 'master' of https://github.com/hackerunion/root