Quick merge: local with git's
My local git on sync with github