install bower
Merge branch 'master' of https://github.com/sheez44/Site-for-local-table-tennis-club

Conflicts:
	index.html

git pull