Added 6005 material
Merge branch 'master' of github.com:gchau94/personal_git
Merge conflit, README