sample file generator
Merge branch 'master' of ssh://git@github.com/jucabot/polymr.git

Conflicts:
	polymr/test.py