fixed head and ready to pull
merging conflicts with user edit
created bootstrap.js