Added FLASH fields
Merge branch 'master' of github.com:rth/hedp

Conflicts:
	hedp/pp/flash_fields.py
Merge branch 'master' of github.com:rth/hedp
Merge branch 'master' of github.com:rth/hedp

Conflicts:
	hedp/pp/flash_fields.py