ln command now creates symbolic link
Merge branch 'master' into laptop