ignore *.log
Fix for issue #3
Merge remote-tracking branch 'origin/master' into gh-pages