added same feature
Added feature_c file
added hi method
Merge pull request #1 from dstavis/feature_c

Feature _c
added a discrepancy to same_feature
created same_feature on feature_a
pulling feature_c onto feature_a
Merge branch 'feature_b' of https://github.com/dstavis/GitFlowTest into feature_a

Conflicts:
	same_feature.rb
Merge pull request #2 from dstavis/feature_a

Merge feature a, feature b, feature c, and same_feature to master