???
Merge branch 'master' of https://github.com/rbaylis91/Solo-Redesign

Conflicts:
	skeleton-theme-master/.DS_Store
Ignore this plz
Updated ignore