Merge pull request #1 from TheOdinProject/master

Sync to ngehani