wiring it together
Merge pull request #3 from billyS/firstBranch

wiring it together