viola
Test http-equiv="refresh"
new
Merge branch 'master' of https://github.com/WScience/Landing

Conflicts:
	index.htm
new