Merge pull request #2 from bonbombs/master

Testing file
Merge pull request #1 from WPI-GameDevs/master

Sync
Merge pull request #3 from bpeake13/in-progress

In progress