first commit
second commit
Added a line in a new branch
removed .DS_Store from repo
Test
Merge branch 'master' into gh-pages

Conflicts:
	readme.txt