Adding in S Modal Pop Pieces
Merge branch 'refs/heads/master' into HIRO

Conflicts:
	less/main.less
	style.css
Merge pull request #10 from htakahashi/hiro

Hiro