added task 2 and still fighting with bootstrap