aaaa
Merge branch 'master' of https://github.com/JeonJin/HTML5_2014_12

Conflicts:
	HTML5_study/jjkang/html/.DS_Store
	HTML5_study/jyoh/Guess_The_Letter/.DS_Store
	HTML5_study/jyoh/day_1/js/.DS_Store
oh~