Changing address of the tsv file used in the import task
Merge with HEAD
Changed People index page
Changed carrierwave store_dir
Changed config.assets.compile to true
vendor compiled assets
vendor compiled assets
Add images
changed carrierwave store_dir
vendor compiled assets
Added images
Merge branch 'master' of heroku.com:infinite-shelf-3779

Conflicts:
	.gitignore
	app/uploaders/image_uploader.rb