added my name
fix merge error
add my file
fixed error
Merge branch 'master' of https://github.com/kjventura/gitbasics
Merge branch 'master' of https://github.com/kjventura/gitbasics
Merge branch 'master' of https://github.com/kjventura/gitbasics
Merge branch 'master' of https://github.com/kjventura/gitbasics
Merge branch 'master' of https://github.com/kjventura/gitbasics