Changing to markdown
Merge pull request #36 from fredpalmer/feature/version

Pull request to fredpalmer/develop from fredpalmer/feature/version
Merge pull request #37 from fredpalmer/develop

Update master from develop