Combine Edit with Master,fixes #1

Added brief bio