added introJS functionality and styled button
fixed m conflicts
Merge pull request #41 from mule-deer-2013/fixing_tests

Fixing tests
fixed scorekeeping bug in pages#show
Merge pull request #42 from mule-deer-2013/bug_fix

fixed scorekeeping bug in pages#show
fixed introJS styling
fixed m conflicts
Merge pull request #43 from mule-deer-2013/TourV2

Tour v2
add updates to overlay
Merge branch 'master' of https://github.com/mule-deer-2013/siteKick into OverlayPart2
fixing pages#show error
Merge branch 'master' of https://github.com/mule-deer-2013/siteKick into OverlayPart2
update overlay for first 150 words
add background for feedback box
add class to update overlay for all categories
Merge pull request #44 from mule-deer-2013/OverlayPart2

Overlay part2: updating javascript code to include all categories
removed working href links from tests