initial commit
fixed merge conflicts
git pull origin master