Update on what was used in turn in
Merge branch 'master' of github.com:ValRose/ECE425W1415

Conflicts:
	Lab0_Alex/MATLAB/lab1.m
	Lab0_Alex/odometryMeasurements.xlsx

Manualy Resolved conflicts
Merge branch 'master' of github.com:ValRose/ECE425W1415

Conflicts:
	Lab0_Alex/MATLAB/lab1.m
	Lab0_Alex/odometryMeasurements.xlsx
Merge branch 'master' of github.com:ValRose/ECE425W1415

Conflicts:
	Lab2/lab2demo/lab2demo/Debug/lab2demo.elf
	Lab2/lab2demo/lab2demo/Debug/lab2demo.hex
	Lab2/lab2demo/lab2demo/Debug/lab2demo.lss
	Lab2/lab2demo/lab2demo/Debug/lab2demo.map
	Lab2/lab2demo/lab2demo/Debug/lab2demo.o
	Lab2/lab2demo/lab2demo/Debug/lab2demo.srec
	Lab2/lab2demo/lab2demo/lab2demo.c