Merge branch 'master', remote branch 'origin'
cleaned up readme files on setup and added gitignore