merged files together and mades notes with Ben
Merge pull request #7 from jpark1120/master

merged files together and mades notes with Ben