Merge branch 'master' of https://github.com/DrWhax/otr.im
Merge branch 'master' of https://github.com/DrWhax/otr.im
due to previous commit / removed border
Merge pull request #9 from u451f/master

refactor me baby.