Testing first commit

I have changed one line of the file quotes.html, check it out.
Merge branch 'tom-1'

Conflicts:
	quotes.html
Added some stuff