Merge branch 'master' of https://github.com/Yongdae-Kim/frontend-class

Conflicts:
	Study05/study05.txt
middle test
report06
0514
Merge branch 'master' into gh-pages