Merge
Blogg och hero
Merge branch 'marcus'

* marcus:
  Changed tweet colors to be in line with the rest of the site
  Refactored "Timeline" HTML/CSS and shrunk images
  Responsive square grid
  Merge micke's changes

Conflicts:
	css/custom.css - whitespaces
	index.html - whitespaces
responsiv blogg
Merge mickes branch