added gjwhf song
Merge branch 'master' of https://github.com/cman131/boatsboatsboats

Conflicts:
	songs.js