Merge pull request #8 from htakahashi/Dustin

Dustin
06
Merge pull request #9 from htakahashi/josh

06
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
PREASE WORK
Merge pull request #11 from htakahashi/josh

PREASE WORK
working on 7

Signed-off-by: Dustin Christensen <dustyman@gmail.com>
Merge branch 'refs/heads/master' into Dustin

Signed-off-by: Dustin Christensen <dustyman@gmail.com>

Conflicts:
	style.css