Cleaned up merge conflict in main.js
Merge branch 'master' of github.com:zhbanton/photo_mixer

Conflicts:
	app/assets/javascripts/main.js
Users can search by caption which outputs to images index, renamed search results
Users can search by caption which outputs to images index, renamed search results
Updated main.js
Added to gemfile
Merge branch 'add_search' of github.com:zhbanton/photo_mixer into add_search
Merge pull request #52 from zhbanton/add_search

Users can search by caption which outputs to images index, renamed searc...