adding bootstrap baby
fixing merging conflict