fixed file paths for resource files
Merge remote-tracking branch 'origin/master'

Conflicts:
	waves.html

Remote changes were due to a pull request. I had also made local changes and file renames. Merged conflicts.