initial commit
Added more files to gitignore
More commits
Merge branch 'master' into gh-pages