Merge pull request #36 from NicholasPiano/testing-phase-1

Testing phase 1