added text. now this commit is ahead of master... fast forward
merged gh-pages into master after conflict resolution