Fix #20 and make it look pretty
Fix merge conflicts
Merge branch 'tabs' of http://github.com/neerajwahi/pairjam into tabs