Merge pull request #1 from peterkim95/master

init commit
Merge remote-tracking branch 'origin/gh-pages'