Ryan updated index
Merge pull request #1 from RKim220/jack

asking ryan to be polite and nice to me
resolved merge from master
updated index
Merge pull request #2 from RKim220/ryanbranch

happy that ryan is friendly
made changes to line 11
made change to line 11 in master branch
fixed merge conflict