no actual changes, just committing
Merge branch 'master' of https://github.com/ealtenho/happyblue

git commit -m "merging"
Merge branch 'master' of https://github.com/ealtenho/happyblue
small changes
correcting merge