user can upload profile photo, view user profile page
user has a thumbnail version of their profile photo
test added
search implemented, need form
Merge branch 'aw-pagination' into aw-search
Search page added, search function complete, need tests
Added feature spec test
user can upload a cat or submit a url
fixes made per comments
Merge branch 'master' of https://github.com/LaunchAcademy/caturday_funtime into uploads
test uploads are sent to public directory
Merge branch 'uploads' into upload_cat

Conflicts:
	app/models/cat.rb
	app/views/cats/show.html.erb
	config/initializers/carrierwave.rb
todo tasks updated
Clean up some tests.
Merge branch 'uploads' into upload_cat
Merge pull request #23 from LaunchAcademy/uploads

Uploads
Add index to look up cat URL.

This is needed since we check for uniqueness if a cat
URL is supplied. It cannot be unique because the column
can contain NULL values if the user decides to upload
their own image instead.
Clean up uploader.

Remove unused comments, fixed indentation.
Validate can only submit URL or upload file.

Also cleaned up test suite a bit.
Merge pull request #26 from LaunchAcademy/upload_cat

Upload cat