Merge pull request #9 from FC-Chaps/databox

Minor graphics update
Merge pull request #10 from FC-Chaps/databox

Text to databox
new ting
Merge branch 'master' into benjiBranch

Conflicts:
	index.html
Merge pull request #11 from FC-Chaps/benjiBranch

Benji branch
Revert "Benji branch"
Merge pull request #12 from FC-Chaps/revert-11-benjiBranch

Revert "Benji branch"
Merge pull request #13 from FC-Chaps/databox

Include fades
def
Merge pull request #14 from FC-Chaps/benji

def
jn
hj
hey
Merge pull request #15 from FC-Chaps/benji

Benji
tin
kashdf