testing
Merge branch 'master' of https://github.com/cfriedman/freereg

Conflicts:
	README
adding file for testing