initial commit
updated log file
Merge branch 'develop'