FANCY
Merge branch 'master' of https://github.com/Maaartin/SportAnalyze

Conflicts:
	src/main/java/com/velts/myapp/objects/Results.java
	src/main/webapp/WEB-INF/views/competitions.jsp