second commit
Merge branch 'master' of https://github.com/subalary/IAF

Conflicts:
	IAF.m
second commit