upd
upd
upd
Merge branch 'master' of https://github.com/SpartanTheme/st

Conflicts:
	.DS_Store
	library/.DS_Store
	library/css/global.css