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

changed slide 5 and 7 orders
Adding more interactions to both modules
Merge pull request #21 from htakahashi/hiro

Adding more interactions to both modules
Added lightbulb hovers
Merge branch 'refs/heads/master' into hiro
Merge pull request #22 from htakahashi/hiro

Hiro
added page content and styles to page 5

Signed-off-by: Dustin Christensen <dustyman@gmail.com>
Merge branch 'refs/heads/master' into Dustin
Merge pull request #23 from htakahashi/Dustin

Dustin
Added interaction to some pages.
Merge pull request #24 from htakahashi/hiro

Added interaction to some pages.
09 and 10