made changes
cause conflict
conflict
merged branches
new feature
Merge pull request #2 from wdi-sf-march-2014/feature

Feature