Testing file actions

removed a file, added dummy.txt, updated README

Signed-off-by: Steven Jackson <sjackson@sapient.com>
Merge branch 'master' of github.com:jacksinn/git-features

Signed-off-by: Steven Jackson <sjackson@sapient.com>

Conflicts:
	README