Changed stuff
Changed text in section 3.2
Solved conflict
Merge github.com:marcusnygren/Elements