friday stuff
mergymergymergemerge
Merge pull request #7 from olliegill/master

PREMERGEURE OPTIMERGATION