saguna's commit
Merge branch 'yammer' of github.com:BenTobias/tontine into yammer
Merge branch 'yammer' of github.com:BenTobias/tontine into yammer
Merge branch 'yammer' of github.com:BenTobias/tontine into yammer

Conflicts:
	public/stylesheets/style.css
Merge branch 'yammer' of github.com:BenTobias/tontine into yammer
Merge branch 'yammer' of github.com:BenTobias/tontine into yammer
Merge branch 'yammer' of github.com:BenTobias/tontine into yammer
aguna's changes
Merge branch 'yammer' of github.com:BenTobias/tontine into yammer
saguna's changes
grayscale
GREY THINGS
Fixed conflicts.