Added .pentadactylrc on macbook.
Merge branch 'master' of https://github.com/MazeChaZer/dotfiles

Conflicts:
	pentadactylrc