jquery search
Merge branch 'master' of github.com:daniel1bell/PhotoSharing

Conflicts:
	app/assets/javascripts/application.js
	app/views/albums/index.html.haml
search picture tags working - including js/ajax