Edited Header
Merge branch 'master' of https://github.com/riminangelica/happygram