First pages commit
Music modals and htaccess
Fix merging