Merge branch 'master' of github.com:PDX-Flamingo/codoncount-prototype-c

Conflicts:
	README.md
Merge branch 'master' of github.com:PDX-Flamingo/codoncount-prototype-c