Fixed compile errors for lab2.c, mostly related to missing includes
Merge branch 'master' of https://github.com/djvolz/seizurecopter

Conflicts:
	lab2/lab2.c
	lab2/lib/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s