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