updated
Merge branch 'master' of https://github.com/palmersndrsn/Is_it_cool
updated