added picture functionality. Need to add thumbnails to views
Merge branch 'picture_functionality' into dev

Conflicts:
	app.rb