.pentadactylrc
abc
Merge remote-tracking branch 'origin/master'

Conflicts:
	pentadactyl/.pentadactylrc
Merge remote-tracking branch 'origin/master'
vim, xterm
git, xterm