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