merge issues fixed
attempt to fix merge conflicts
added icons to contact info on the index.php
matched the singles artwork display style with gallery styles
final site changes, site has been live and presented