Main.css was modified -- will add this to git-ignore
Merged remote master into local master