merging upstream/master. Updated gitiginore