.
Merge branch 'master' of https://github.com/yungyikim/sample

Conflicts:
	win/Sample_VC100/Sample_VC100.suo
.
Merge branch 'master' of https://github.com/yungyikim/sample