small formatting change in config routes.
fixed merge conflict.
Merge branch 'master' of github.com:scurtiss/Wishlist

Conflicts:
	config/environments/development.rb
changed edit wish list button, fixed wish list table formatting.