changed background color and borders
Fix merge conflicts
Merge pull request #11 from sneubig/fix_merge

Fix merge