This is a quick commit so I cna fix mark's

Fixing Mark Branch
Merge pull request #14 from TeamAwesome5u/Micah

Final merge of everyone's code.