1px border is 4 cool l kidz
BORDER
Merge branch 'master' of github.com:Adjective-Object/Ocean-irc
fuck your merge