my change 18:25
removing generic macros
adding anchors
Merge origin/master

Conflicts:
	src/newfile.txt