Final Stuff!!!
Merge pull request #7 from jameslfc19/master

FINAL PUSH D: