FORMATTING
Merge pull request #10 from nickoram/master

FORMATTING
TASK-8: Get P2P working, half there