<<<<<<< HEAD var = 'this is a test doncha know' ======= var = 'this is a test of testyness' >>>>>>> branch