Colored Buttons
Fix
Merge remote-tracking branch 'origin/joe'
Merge branch 'master' of https://github.com/abhinavnair92/HomeAppetit
Merge branch 'master' of https://github.com/abhinavnair92/HomeAppetit

Conflicts:
	FAQ.aspx
Merge branch 'master' of https://github.com/abhinavnair92/HomeAppetit