Alustatud competition listi küsimist
Merge branch 'master' of heroku.com:sport-analyze

Conflicts:
	src/main/java/com/velts/myapp/scribe/FacebookScribeAuthenticator.java
Fixed conflict
Merge remote-tracking branch 'origin/master'