Merge branch 'pr/1'

Conflicts:
	Timer_Interupts/Timer_Interupts.c