update background image
changes to pages are now saved and associated properly when user is signed in and requests a new page
Merge pull request #20 from elreimundo/background_image

update background image
Merge pull request #22 from elreimundo/link_pages_and_users

changes to pages are now saved and associated properly when user is sign...
Merge branch 'controller-accepts-page-name' of https://github.com/elreimundo/makeupedia into controller-accepts-page-name

Conflicts:
	app/controllers/wikis_controller.rb