trianglify
fix timeline
trianglify release
autumn palette
merge from search page change
search page
Merge branch 'trianglify'

Conflicts:
	tongrenlu/src/main/resources/templates/home/comic/search.html
	tongrenlu/src/main/resources/templates/home/music/search.html