Adding Haar trainer to repo.
Changes to DStar for demo to Paul on 3-28-14 - Currently has obstacle detection commented out.
Obstacle detection still has some bugs.
Cleaned up some code.
Added NavTestPrograms directory. Instructions for running are in lab notebook.
Merge branch 'Ajay' of https://github.com/amccaleb/UCSC-Rover-2014.git
EncoderDrive: improved speed estimation using circular buffer
PID: fleshed out PID so it's ready for basic testing
Image processing and navigation are now in the same program
Navigation test can now run independent of rover setup
Image processing can now operate independent of the status of built-in webcam
Refactors are coming for full image processing and navigation integration
DriveEncoder sample rate and buffer size adjusted.
PID tuned on blocks (performs quite well)
Added PID speed control to the Drive module.
Adding Haar Training application, source and samples to repo.
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014.git

Resolved some conflicts and removed some files that shouldn't be under version control. Hopefully won't break everything right now

Conflicts:
	trunk/Software/Haar/opencv-haar-classifier-training-master/mergevec
	trunk/Software/Haar/opencv-haar-classifier-training-master/negatives.txt
	trunk/Software/Haar/opencv-haar-classifier-training-master/samples.txt
PID tuned and drive can access it. DriveDistance now uses PID.
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014.git
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014

Conflicts:
	trunk/Software/MPLABX/A_practice/MotorTestWithEncoders/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/A_practice/ObstacleDetect/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/A_practice/ObstacleDetect/nbproject/Makefile-local-UNO32.mk
	trunk/Software/MPLABX/A_practice/ObstacleDetect/nbproject/private/configurations.xml
	trunk/Software/MPLABX/A_practice/message_protocol/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/A_practice/message_protocol/nbproject/private/private.xml
	trunk/Software/MPLABX/A_practice/template.X/main.c
	trunk/Software/MPLABX/A_practice/template.X/nbproject/Makefile-UNO32.mk
	trunk/Software/MPLABX/A_practice/template.X/nbproject/Makefile-genesis.properties
	trunk/Software/MPLABX/A_practice/template.X/nbproject/configurations.xml
	trunk/Software/MPLABX/includeRover/Drive.h
	trunk/Software/MPLABX/includeRover/ROVER.h
	trunk/Software/MPLABX/includeRover/Steering.h
	trunk/Software/MPLABX/includeRover/message_tx.h
	trunk/Software/MPLABX/src/BOARD.c
	trunk/Software/MPLABX/src/Uart.c
	trunk/Software/MPLABX/src/pwm.c
	trunk/Software/MPLABX/srcRover/EncoderSteer.c
	trunk/Software/MPLABX/srcRover/dynamicProximity.c
	trunk/Software/MPLABX/srcRover/message_rx.c
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014
Merging sean's branch into master

Merge remote-tracking branch 'origin/sean'
Merging my branch into master repo

Merge remote-tracking branch 'origin/Ajay'
Adding most recent state of rear wheel driving code for Jon.
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014.git
Added some documentation on Advanced Git usage
Rewrote the README at the top level to list the scripts that can be used for git
Rewrote the README in Software/linux with instructions on running tests on the OpenSuSE laptop
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014.git
Added git scripts to simplify most git interactions.
NOTE: The setUser script doesn't actually work as the only way to get it to work independent of an SSH connection is to do the encryption myself