Add capitalization conventions.
Merge pull request #2 from jhorbulyk/Jacob-UpdateConventions

Add capitalization conventions.