modified:   public_html/css/main.css
Merge branch 'master' of github.com:Shah-Parth/info.parthshah.us

Conflicts:
	public_html/css/main.css~