Merging flackstyling into master

ay check it out