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