Toggling buttons on traits
Merge branch 'master' of git+ssh://github.com/Healthy-World/HeathlyWorld

Conflicts:
	public/partials/traits.html
Results page
Merge branch 'master' of git+ssh://github.com/Healthy-World/HeathlyWorld

Conflicts:
	public/css/style.css