Merge pull request #13 from htakahashi/Dustin

Dustin
glow times
Merge branch 'refs/heads/master' into josh

Conflicts:
	style.css
Merge pull request #14 from htakahashi/josh

Josh
Updating z-index
Merge pull request #15 from htakahashi/hiro

Updating z-index
set timeout in
Merge pull request #16 from htakahashi/josh

set timeout in
S Module pref, next function implemented
Merge pull request #17 from htakahashi/master

S Module prev/next functionality
Merge pull request #18 from htakahashi/hiro

Merge pull request #17 from htakahashi/master
Ignoring .ds files
Merge branch 'refs/heads/master' into hiro
Merge pull request #19 from htakahashi/hiro

Hiro
changed slide 5 and 7 orders

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