added contentsOfFileAt: for completion
Merge remote-tracking branch 'origin/master'