2b 3
Merge branch 'master' of https://github.com/LegendaryAks/Wellness

Conflicts:
	css/main.css
	img/sprite.png
	img/sprite.psd