removing files folder from tracking
adding design files into repo
removing safari sheet from sass folder
Merge branch 'master' of github.com:noslouch/shanghai-home

Conflicts:
	.gitignore
	css/master.css
	files/documents/JD-ADAA.pdf
	files/documents/JD-Desktop_Support_Specialist.pdf
	files/documents/JD-Head_for_ATS.pdf
	files/documents/JD-Senior_Windows_Administrator.pdf
	files/documents/JD-Sr_Advisor_Provost.pdf
	templates/default_site/about.group/.list-workhere.html
	templates/default_site/cnabout.group/.list-workhere.html
Merge branch 'master' of github.com:noslouch/shanghai-home