My branch

Hopefully it's formatted correctly now. Let me know if i need to make any more changes.