readd er.txt
redel er.txt
readme
added css
added index.html
update index.html
added readme
fix index
life is life
merged master fixed conflict
added temp
added mir
Merge branch 'master' into temp