Added new files
Added yacks
Added line
by the power
of grayscull
added local changes
Merge branch 'br1'

Conflicts:
	file2
Ignore .DS_Store files.
two
Merge branch 'master' of /Users/titusjan/Programming/pruts/git/myrepo

Conflicts:
	file2
Removed lines
Merge branch 'master' of https://github.com/titusjan/myrepo