Merge pull request #20 from nickburscough/master

fixing merge problem
test
test
fuckign work
removed old main
sorted, you bugger?
readme updated for new main
more readme updates
readme elegance
finishing off the big night
random file