add reqs.txt that wasn't there?
Merge branch 'master' of github.com:sc3/cook-convictions
Merge branch 'master' of github.com:sc3/cook-convictions into credit-include
put credits in separate file
messing around with two tiers of nav
start working with two tiered nav; show the individual slides as dots
Merge pull request #72 from bepetersn/two-tier-nav

Basic two tier nav
Merge branch 'master' into two-tier-nav

Integrate some of my layout changes with @bepetersn's nav
templating.

I couldn't get the num_slides macro to work.  The extension that
provides the ``do`` keyword wasn't loaded and I wasn't sure how
to do this within Tarbell.  It was easy enough to just iterate
through the slides and use an ``if`` statement.

Also update ``index.html`` to render nested sections for both
the top-level and slide elements.

Make the circles links to the slides.

Conflicts:
	css/simple.css
	slides/intro.md
modularize css; get rid of 'blah'
navigation functional
give better nav spacing, finish removing simple.css
Merge pull request #73 from bepetersn/two-tier-nav

Two tier nav updates

Pair programming FTW