Update Resources.md
Resolve merge conflict
Merge branch 'master' of github.com:ideabrian/ideas-for-new-programmers
Add Getting Git Right