added constants. updated gitignore file
merging