first commit
second commit
commit?
third commit (on master)
Added my second file.
*
What if you are commitment phobic?
comments on Neels.
added a couple files
merge ok (I think)
added newfile1
changes to read me for new feature
Merge branch 'newfeature1'

Conflicts:
	readme.txt
removed lsast line
work on newfeature1
add readmit to newfeature1
???
Revert "add readmit to newfeature1"

This reverts commit 6bdd00d3680ff9da48522026cd4c3ca0ec293cf9.
delete
add file for feature