Merge pull request #25 from MikeESL/myFunctioneers

activitys if statements now seem to be working! Booyah, merged by Devon
all JS seems to be working correctly. Please test.