added twitter boot strap and added basic styling to a few pages
merge conflicts resolved