Changed minor stuff
Conflict
Merge branch 'master' of github.com:marcusnygren/Elements