Am adaugat bootstrap si static_pages#1
Am creat layoutul de baza al aplicatiei#1
am reparat conflictele #1