(18 apr)modified gitignore file
commiting file_1.txt
testing at 3.20
commiting at 3.21 pm
Merge branch 'bugfix_main'

Conflicts:
	File_1.txt
	adding_new_file.txt
at 3.34 pm
at 3.36 pm
Merge branch 'bugfix_main'