Incoming conflict
Merge branch 'master' of github.com:marcusnygren/Elements
Hello
Solving conflict