changes
merging conflicts
Removed h3 to fit screen marielos pages