Refactored code out of the header file (Closes #13)
Merge branch 'master' of github.com:pam2599/cs371p-darwin