still troubles
Merge branch 'master' of github.com:zlotnika/gene-expressions

Conflicts:
	app/assets/javascripts/angular_tissues.js
	app/assets/javascripts/application.js