initial commit of the project
added files from github
fixed merge conflict from github