updates
Update README.md
added a new line in README
fixed conflicts :D
added a new line in Readme file
add a new html file
Merge pull request #2 from silviugania/master

Finished task 1
ok ok ... let's merge things up!
Create logo.html

added the logo file
Update logo.html

testing fork sync
Update 1.html

testing fork sync 2
Merge branch 'master' of https://github.com/XivicSilver/internship-xivic-logo