First Time Commit
Merge pull request #1 from jamesfarhat/master

Committing the main code here.