Added gitignore, bashrc
Merge branch 'master' of github.com:jamesinchina/workstation-setup