matlab testing
pulled ryans stuff
commiting ryans pull again
modified the labview RT file
Merge commit '9a9e35da9945ea564ff31bd3d5ff4c628bce6adf'

Conflicts:
	labview/CLIP/ublaze.xml
	labview/FPGA Bitfiles/natcar_FPGATarget_Top-Level_610FB000.lvbitx
	labview/LVFPGA/Top-Level.vi
	labview/LVRT/Run Bitfile.vi
	labview/natcar.aliases
	labview/natcar.lvproj
	ublaze/.metadata/.log
	ublaze/.metadata/.plugins/com.xilinx.sdk.hw/dialog_settings.xml
	ublaze/.metadata/.plugins/org.eclipse.cdt.core/.log
	ublaze/.metadata/.plugins/org.eclipse.cdt.core/microblaze_bsp.1333600281668.pdom
	ublaze/.metadata/.plugins/org.eclipse.cdt.core/natcar.1332276307583.pdom
	ublaze/.metadata/.plugins/org.eclipse.cdt.make.core/natcar2.sc
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/0/c0a3bdbec27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/0/e00b4b7fc47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/10/208b1ba8c57e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/15/d0ce1875c67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/17/f0552dd1c27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/19/60262538d87e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/19/b04634ffd77e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/22/f05b7c8ec47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/23/f090435bc47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/26/40a574edc47e001117f7e474214b7e0d
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/26/c0fa840dd87e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/27/908670edc47e001117f7e474214b7e0d
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/28/b0196d8ec47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/29/8065cefec27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/29/a06312e8c27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/29/f007b3a2c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/2b/404cd212c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/2b/70a0425fc37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/2e/20e0d612c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/3/205f7c1dc67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/33/7019890dd87e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/35/5009a281c67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/36/301d05e8c27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/39/80715f25c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/3a/d0ee25ffd77e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/3c/c0ab0f2ac67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/3d/f056516bc77e001110859d7f14f71670
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/44/90c50c2ac67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/47/30a4771dc67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/54/203c30d1c27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/55/908731ffd77e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/57/907e21a8c57e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/59/20ee791dc67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/5a/00d6838ec47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/5a/90342affd77e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/5e/e0ba6c03c57e001117f7e474214b7e0d
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/5f/200cb1a2c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/62/30ff215bc47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/67/e05f1da8c57e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/6a/305054b1c77e001110859d7f14f71670
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/6a/a05a69edc47e001117f7e474214b7e0d
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/6a/c01d476bc77e001110859d7f14f71670
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/6c/208a507fc47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/6c/802a66b1c77e001110859d7f14f71670
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/6f/b0bbb44ec57e00111881c4c4fd5d5f8e
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/73/40526dedc47e001117f7e474214b7e0d
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/75/00ba965bc47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/76/f00e08acc27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/79/30933f5fc37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/83/c0f4b880b97e001114dfe7640011d934
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/85/1048d412c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/87/50c3445fc37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/8a/707d0fe8c27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/8d/603e04acc27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/96/c0dd6e03c57e001117f7e474214b7e0d
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/a/70cdcbfec27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/a/e00fb9bec27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/a3/406f1775c67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/a5/30865392c57e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/a5/8083c9fec27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/a8/a089da12c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/a8/c04d8c0dd87e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/a9/b0277103c57e001117f7e474214b7e0d
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/aa/a0ce112ac67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/aa/c0495625c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/ab/104fa681c67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/ae/a045748ec47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/af/d059bbbec27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/b0/b0d9af4ec57e00111881c4c4fd5d5f8e
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/b2/20ad32d1c27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/b2/d07ab74ec57e00111881c4c4fd5d5f8e
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/b4/80de697fc47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/b5/107e5925c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/b5/5081751dc67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/b7/f0ad9e81c67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/bd/40005b92c57e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/bf/e0496a03c57e001117f7e474214b7e0d
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/c0/70551a75c67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/c6/d0f00a2ac67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/c7/203101acc27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/c7/302ca481c67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/c8/c064fbabc27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/ca/e0dc496bc77e001110859d7f14f71670
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/ce/00b1c0bec27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/d5/b00ebc4ec57e00111881c4c4fd5d5f8e
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/d7/a0ab407fc47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/d9/606c5692c57e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/db/104d830dd87e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/de/90e43c6bc77e001110859d7f14f71670
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/e/400d475fc37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/e2/f0d30be8c27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/e4/a0d3afa2c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/e8/d02ab5a2c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/f/70404f92c57e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/f1/b00f1675c67e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/f1/c01a2dffd77e00111bcbbf5dd79bd6b2
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/f5/20165c25c37e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/fa/c0821fa8c57e00111fd1bebb8938bc04
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/fa/f0dc605bc47e00111746c6984f3bdf02
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/fb/a060c7fec27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.history/fc/e0bd2ad1c27e001112eecca6a81f83dd
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.projects/microblaze/.indexes/properties.index
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.projects/microblaze_bsp/.indexes/properties.index
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.projects/natcar/.indexes/33/e4/52/history.index
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.projects/natcar/.indexes/33/e4/history.index
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.projects/natcar/.indexes/33/history.index
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.projects/natcar/.indexes/properties.index
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.projects/natcar/.markers
	ublaze/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	ublaze/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.core.prj-microblaze_bsp.prefs
	ublaze/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.core.prj-natcar2.prefs
	ublaze/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs
	ublaze/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
	ublaze/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	ublaze/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	ublaze/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
working on round 2 labview stuff
ready for testing and calibrating sensors
added distance to the data that is recorded (forgot to do it before)
small changes. everything's good to go except the Analog Inputs need to be mapped to the Sensors.