global.scss now in aphabetical order
modifications to git conflict
imageholder about modifications and classes modifications, media page