added a couple more tests to test-content.R for unit testing content
Merge branch 'master' of https://github.com/swirldev/swirlfancy
pulling bill's changes before pushing my own
Merge remote-tracking branch 'swirldev/master'