add in .gitignore
update my own Manifesto
Merge remote-tracking branch 'origin/master'