/gifts, /gifts/new, login, signup, 'home' working, but if signed in, routes redirect to landing page
added landing controller. Fixed landing view. Setup controller to render HTML and JSON.
Merge pull request #23 from Jamanius/devise-views2

/gifts, /gifts/new, login, signup, 'home' working, but..
starting to integrate carrierwave
Merge branch 'master' of https://github.com/Jamanius/GIFTe into make_a_listing_page

Conflicts:
	app/controllers/gifts_controller.rb
	app/models/gift.rb
	app/views/gifts/index.html.erb