CompetitionControlleri täitmisega alustatud.
Merge branch 'master' of heroku.com:sport-analyze

Conflicts:
	src/main/java/com/velts/myapp/scribe/FacebookScribeAuthenticator.java