Maj before conlifct
Merge branch 'master' of https://github.com/ScaY/Check_n_Cook.git