Merge pull request #5 from htakahashi/Dustin

Dustin
adding slide 2

Signed-off-by: Dustin Christensen <dustyman@gmail.com>
Merge pull request #6 from htakahashi/Dustin

adding slide 2
Surprising06
Merge pull request #7 from htakahashi/josh

Surprising06
built pages 4 8 11

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

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

Conflicts:
	footer.php
	less/main.less
changes

Signed-off-by: Dustin Christensen <dustyman@gmail.com>
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