br=eda
Merge branch 'master' of ssh://git@github.com/KurlesHS/timer.git

Conflicts:
	src/com/example/timer/CustomView.java