update gitinore
delete *.iml
Revert "delete *.iml"

This reverts commit 7cc37078193ee5915cfaad70b041c3a021db0ddd.
Merge branch 'master' of https://github.com/Gabi09/3DHouse

Conflicts:
	.gitignore
integrate houses