tag cloud is up an running
Merge branch 'master' of github.com:zhbanton/photo_mixer into tag_cloud

Conflicts:
	app/assets/javascripts/main.js
Cleaned up merge conflict in main.js
Merge pull request #50 from zhbanton/tag_cloud

Tag cloud
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
Updated main.js
Added to gemfile
Merge branch 'add_search' of github.com:zhbanton/photo_mixer into add_search