branch for github.io
adding bower_components
fix bootstrap issue
fix main view link
forgot to push last night, change to the base
base change
Merge branch 'gh-pages'

Conflicts:
	.gitignore
	app/index.html
	app/scripts/app.js
added support for win by penalties
Merge branch 'master' of https://github.com/rickitan/angularWorldCupPool

Merging with github online changes.