First stage in incorporating walkthrough
Commit to switch branch
Committing so I can switch to walkthrough branch
Merge branch 'master' of https://github.com/hlmason/musiclaps2 into walkthrough
Partially clean up Captivate files
Merge branch 'master' of https://github.com/hlmason/musiclaps2 into walkthrough
Refactor
Merge branch 'nav-redesign'
Merging Julie's Captivate files