merged master
rebuild database such that the buttons have working titles. now we need to add the interlude page
Merge pull request #21 from PCS-Javascript-Junkies/crouseMatthew

Crouse matthew