ok
Merge branch 'master' of https://github.com/maxlilja/affAIRs

Conflicts:
	affAIRs.v12.suo