getting ready for merge from gh-pages
changed the gitignore file
fixed untracked files