add app confih
update gitignore
extraneous commit
merge