changed
finish feature a
Merge pull request #1 from priest89/feature_a

Feature a