update gitignore
Merge pull request #1 from athenajs/dev

Dev
Merge branch 'gh-pages' into dev