fixed .DS_Store record in gitignore
Added cal command
Merge branch 'cal'