Merge two results
Merge two results
:Merge branch 'master' of https://github.com/pepi09/WorldCup

Conflicts:
	index.html
Test
Test
Test
- info
- info
Teams details in popup added
Export js into app.js
Merge branch 'merge_results'

Conflicts:
	index.html
start_time
Merge remote-tracking branch 'origin/pepa'

Conflicts:
	app.js
	index.html
Merge conflicts
progress bar