Merge branch 'master' of https://github.com/thr3folio/public_html

Conflicts:
	.DS_Store
	css/thr3folio.css
	img/proj2_img1.jpg
	img/proj2_img2.jpg
	img/proj2_img3.jpg
	img/proj2sm_img1.jpg
	img/proj3_img1.jpg
	img/proj3_img2.jpg
	img/proj3_img3.jpg
	img/proj3sm_img1.jpg
	img/proj4_img1.jpg
	img/proj4_img2.jpg
	img/proj4_img3.jpg
	img/proj4sm_img1.jpg
	thr3folio_candidate_Ahovi_E.html
	thr3folio_candidate_cohen_y.html
	thr3folio_candidate_hermayssi_h.html
	thr3folio_candidate_kirilov_s.html
	thr3folio_candidate_mobile_Ahovi_E.html
	thr3folio_candidate_mobile_cohen_y.html
	thr3folio_candidate_mobile_hermayssi_h.html
	thr3folio_candidate_mobile_kirilov_s.html
	thr3folio_candidate_mobile_umholtz_m.html
	thr3folio_candidate_umholtz_m.html
	thr3folio_login.html
	thr3folio_proj1_img1.html
	thr3folio_proj1_img1_mobile.html
Updated css for clients.html and jobs.html
Latest updates 6/6/13 with new header and font information
Merge branch 'master' of https://github.com/thr3folio/public_html

Conflicts:
	.DS_Store
	css/thr3folio.css
	css/thr3folio_.css
	img/proj2_img1.jpg
	img/proj2_img2.jpg
	img/proj2_img3.jpg
	img/proj2sm_img1.jpg
	img/proj3_img1.jpg
	img/proj3_img2.jpg
	img/proj3_img3.jpg
	img/proj3sm_img1.jpg
	img/proj4_img1.jpg
	img/proj4_img2.jpg
	img/proj4_img3.jpg
	img/proj4sm_img1.jpg
	thr3folio_candidate_Ahovi_E.html
	thr3folio_candidate_cohen_y.html
	thr3folio_candidate_hermayssi_h.html
	thr3folio_candidate_kirilov_s.html
	thr3folio_candidate_mobile_Ahovi_E.html
	thr3folio_candidate_mobile_cohen_y.html
	thr3folio_candidate_mobile_hermayssi_h.html
	thr3folio_candidate_mobile_kirilov_s.html
	thr3folio_candidate_mobile_umholtz_m.html
	thr3folio_candidate_umholtz_m.html
	thr3folio_login.html
	thr3folio_proj1_img1.html
	thr3folio_proj1_img1_mobile.html