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
Merge pull request #12 from htakahashi/Dustin

Dustin