v1.0 and removed useless files
fixed merge
about.html added
Merge branch 'master' of https://github.com/bicyclus/prototype1