Committing source files
.gitignore fix
merging with master