help
metadata shit

adf
Merge branch 'master' of https://github.com/ormir/EEFA_App

Conflicts:
	.gitignore
metadata fix