Added more lyrics and Foundation template
Fixed merge