testing a bug
Merge pull request #107 from colinsulin/gh-pages

testing a bug