Stylez

Had some weird git problems trying to pull down just now but the auto merge should still work