...
Merge branch 'master' of https://github.com/marcoscolina/genre

Conflicts:
	css/custom.css