Initial Commit
Music modals and htaccess
Fix merging