no message
Merge branch 'master' of https://github.com/gr3man/Training

# By gr3man
# Via gr3man
* 'master' of https://github.com/gr3man/Training:
  no message

Conflicts:
	Exercise7_3/Exercise7_3/TECustomSlider.h
	Exercise7_3/Exercise7_3/TECustomSlider.m
	Exercise7_3/Exercise7_3/TEPopupView.m
	Exercise7_3/Exercise7_3/TEViewController.m