Committing conky config
Added battery output to status bar
Initial commit
Merge branch 'master' of github.com:markhuberty/i3
Fixed repo mess-up