Initial commit
faalhaas
Merge branch 'master' of https://github.com/KosterElise/IrisElise

Conflicts:
	Makefile
	README