just added a remark to play with branching
hotfix comment
Merge branch 'next_prob'

Conflicts:
	linkedList Noams implementationtail pointer.py
merge branch complete
added test file
added and removed some lines in test file
again added to test file
added on master file test2 while branch test changed file test and not merged yet
Merge branch 'test1'
changed test on branch deleting some stuff from masters test file! should make conflict
Merge branch 'test1'