Zack's commit 3
Merge pull request #3 from CacticalWarfare/temp

Zack's commit 3