I've added the tweet section + a few type settings which I'm still messing around
I've added the merge conflict (s)css declarations to modules.scss