Merging master
still messing with the gitignore file