code changes getting horrible error
Merge remote-tracking branch 'origin/master'

Conflicts:
	header_files/basic.h