I add a line in the first file
add three files
made the second change
add the index.html and story file [issue 53]
fixed a problem
finished the new footer [issue 53]
Merge branch 'iss53'

Conflicts:
	index.html