Resolving more merge conlficts, tweaked CSS width
Merge pull request #22 from awillborn/more_css

Resolving more merge conlficts, tweaked CSS width