bump
Merge branch 'master' of github.com:AlexZerr/bonediva into alex_users

Conflicts:
	app/controllers/paintings_controller.rb
Add Edit to user show page
Restyle _user_form
Merge branch 'master' of github.com:AlexZerr/bonediva into alex_users
Picture link
Mess with pictures
Make paintings linkable.
Picture show styling.
Merge pull request #4 from AlexZerr/alex_users

Alex users
Merge branch 'master' of github.com:AlexZerr/bonediva

Conflicts:
	app/uploaders/images_uploader.rb
	app/views/paintings/show.html.erb
Move user info over on Users#show
1 line cleanup
Little controller fix
Merge branch 'master' of github.com:AlexZerr/bonediva
Add delete painting link to paintings show
Merge branch 'master' of github.com:AlexZerr/bonediva into users
Add pictures to user#edit page.
Admin work.
Silly Cleanup