Including ignored files
Fixing ignored file

Conflicts:
	device/Comunication/Wrap_wrap.c
	device/Comunication/startx.py
	files/active.txt
	files/passive.txt
	files/unity_info.txt
	files/unity_rotation.txt