Merge branch 'front-end'

Conflicts:
	selected_sentences.csv
	server.rb
	views/pop_song.erb