merging changes i made offline during the carnaval ate home
importing jquery tricks
moving around to where they belong