update for multiple terms
Merge branch 'master' of github.com:vi-s/gtcw

Conflicts:
	public/css/generic.css