commit

style changes
commit

update gitignore
Merge remote-tracking branch 'origin/gh-pages'