stuff
Merge branch 'master' of https://github.com/Chadtech/holidayJS-team-HiClass