Background class
Background setup
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix white hairline on image
Merge branch 'master' of https://github.com/dreamteam69/Tardis
Merge pull request #189 from dreamteam69/master

Fix white hairline on image
code cleanup
Merge pull request #190 from katiewood/master

code cleanup