Better photo related routing
Exclude note files
Merge branch 'master' of github.com:asolkar/openmarket

Conflicts:
	app/controllers/photos_controller.rb
	app/views/photos/index.html.erb
	app/views/photos/show.html.erb