harmonize conflict in sbp.html
[sbp.git] / index.html
2005-12-12 adaminitial import