setting 2
Merge branch 'master' of https://github.com/resph0ina/ihomepage