Merge pull request #21 from amethystlei/master

Challenge Phase Support
System Test Phase Assembly