merged origin, should fix push non-ff errors
added date insertion command in vim
Merge branch 'master' into laptop