Initial commit
create remote.master.file#1 on remote

create remote.master.file#1 on remote
Merge branch 'local' of https://github.com/jangtaejun/git-another

Conflicts:
	.gitignore
another.local.from.local
Merge pull request #1 from jangtaejun/ano/local

another.local.from.local
Merge pull request #2 from jangtaejun/master

asf