changed mac shortcut because of conflict
Merge pull request #5 from JacopKane/master

changed mac shortcut because of conflict