added xaris code
Merge branch 'master' of https://github.com/jianniskouts/ece_project

Conflicts:
	C_2014/file.txt