added changes to title and subtitle of homepage
changed permissions
resolved conflicts