This is a test of the merging of changes on the server with the local copy on the laptop.
Merge branch 'master' of https://github.com/cshubert/starbiochem_html

Conflicts:
	.idea/watcherTasks.xml
	index.html