Merge branch 'release/1.0' into develop
Merge branch 'develop' of https://github.com/dwelch91/test_git_flow into develop
Adding new stuff
Updating feature 2
Ugly merge commit message :S

Merge branch 'feature/carlos' into develop
It should do a FF
Added a recursive search and replace script to MattUtils.
Final commit of mattFeature
Penultimate commit of mattFeature
Merge branch 'feature/mattFeature' of https://github.com/dwelch91/test_git_flow into feature/mattFeature
Rename mattUtils to utils
Merge branch 'feature/mattFeature' into develop
Merge branch 'release/1.1'