Added navigation menu
Updated base css
Merge branch 'master' of https://github.com/pedro-andrade/bolao

Conflicts:
	worldcup2014/urls.pyc
	worldcup2014/views.pyc