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

Conflicts:
	README.md
	sidebar.php
Updated