fixing more merge conflicts
added in home icon
fixed merfge conflict
Merge branch 'master' of https://github.com/rit/LAplus