testing git stuffs
Still collecting my thoughts
Merge pull request #1 from pblasucci/develop

Develop