merge
adapt gitignore
merge with ipa320