fussing
Merge branch 'master' of github.com:yellowskyscraper/Live
Edits to copy and whatnot