added .sublime settings
Merge remote-tracking branch 'origin'

* origin:
  resolve unexpected end of file
  Added default user.name, user.email for git
  set computer name to mba-mkuehn. added battery ShowTime
  rm AppleHightlightColor adjustment
  rm calc function, erroneous
  Added ll and laf: