vvvv
Merge branch 'master' of
https://github.com/kvitajakub/marathonOctober2014.git

Conflicts:
	demo_video.java
Merge branch 'master' of https://github.com/kvitajakub/marathonOctober2014.git