Test
no message
Merge branch 'develop'

Conflicts:
	USB_Accel_Project/USB_Accel_Project/DockingAnalytics/DockingAnalytics/bin/Release/DockingAnalytics.exe
	USB_Accel_Project/USB_Accel_Project/DockingAnalytics/DockingAnalytics/bin/Release/DockingAnalytics.pdb
Removing generated files.
Adding gitignore.
Removing pdb files.
Merge branch 'master' of https://github.com/Zordonia/AdvisIXAccel

Conflicts:
	USB_Accel_Project/USB_Accel_Project/DockingAnalytics/DockingAnalytics/bin/Debug/DockingAnalytics.pdb
	USB_Accel_Project/USB_Accel_Project/DockingAnalytics/DockingAnalytics/obj/x86/Debug/DockingAnalytics.pdb
	USB_Accel_Project/USB_Accel_Project/DockingAnalytics/DockingAnalytics/obj/x86/Release/DockingAnalytics.pdb
Merge branch 'develop'

Conflicts:
	.gitignore