i guess
some-things
dislike this
to make it work again
sweet got that working!!!!
tieing album_id to the upload
lets gooo
Merge branch 'new_upload'

Conflicts:
	app/views/photos/_form.html.erb