testing heroku
fixed tissue from tissues in routes

Merge branch 'master' of heroku.com:fierce-anchorage-1677

Conflicts:
	config/routes.rb
functioning chip charts
validating for uniqueness of expression
tidying
tidying
routes
routes.  also removing needless assets
Merge branch 'master' of heroku.com:fierce-anchorage-1677
silly merge
cleaning up
adding tags
working on parse_csv