reinit
reinit
init
	modified:   .gitignore
	new file:   test
	modified:   .gitignore
init gitignore
init gitignore
Merge branch 'master' of /var/www/as-web/prod

Conflicts:
	.gitignore
	deleted:    test