rearranged links on index.html
fixed conflicts
message
need to be commited
Merge branch 'master' of https://github.com/medhatelmasry/chad