Merge pull request #2 from WilCrofter/master

merged exp.FSM into master, but did not yet remove clutter
Merge pull request #3 from WilCrofter/master

deleted obsolete files
Merge pull request #4 from WilCrofter/master

Slight changes to testMod.R to ease integration of initialization and user progress code
Merge pull request #5 from WilCrofter/master

changed waitUser.text to waitUser.default,
Merge branch 'master' of https://github.com/WilCrofter/swirlfancy
Merge branch 'master' of https://github.com/WilCrofter/swirlfancy
Merge remote-tracking branch 'swirldev/master'
Merge remote-tracking branch 'gina/master'