Initial commit
Updates file
test
another`
removed
Add .gitignore file
Merge branch 'master' of https://github.com/samselikoff/git_test

Conflicts:
	.gitignore