Initial commit
Pull from origin master - fix merge conflict with gitignore file