Add output file format
Merge branch 'master' of https://github.com/jenniferhyu/pop-gen

Conflicts:
	redraw2.R