test commit

	new file:   public/test.txt
Merge branch 'master' of git://github.com/barif/Meeting