gitignore
Add .project to svn:ignore
Add .project to svn:ignore
Add spacing
fsdfdsfasdfasdf
Merge branch 'adr'

Conflicts:
	aa.txt