Make it blue
Make it red
Merge branch 'red'

Conflicts:
	performance.txt