master into sprint1 (updating the gitignore)