init commit
updated general info
merge