Reverting to fb49b180b976fe3fe6b11baa366b8a26e54f772a
had left git conflict message in there. deleted that.
favicon link
added favicon and modified index.
Merge branch 'master' into foundation_amanjeev.com