Merge branch 'temp'

# Conflicts:
#	examples/anders.png
#	examples/conflict.txt
