Add scalability as criteria
Merge branch 'master' of github.com:mickvangelderen/modern-computer-architecture

Conflicts:
	documents/papers/criteria.txt
Fixing some typos in the "implicit" summary, add text to section 4