finalized user show page styling
Merge branch 'master' of https://github.com/zelzel2315/makeupshadeguide

Conflicts:
	tmp/cache/assets/development/sprockets/068306c47b93e6e00f4d97b83e37f01e
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/1b95e668969dd5c331ed10c5a454fabd
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/bc6a1b572e8a878269d0ae8bc1196b4d
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6