2014_1207_2203
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/style.css
Merge branch 'master' of https://github.com/leeseul1991/leeseul1991.github.com