style
Merge branch 'master' of https://github.com/TetsuyaUmigoto/BPV-Website

Conflicts:
	style.css
Merge branch 'master' of https://github.com/TetsuyaUmigoto/BPV-Website