Merge pull request #23 from TeamAwesome5u/bos

Updating Louis' code
Merge pull request #24 from TeamAwesome5u/Louis

Merge pull request #23 from TeamAwesome5u/bos