Fixed errors
Merge branch 'landingpage' of github.com:woboinc/ujoiner-internsip-1 into landingpage

Conflicts:
	spec/views/landing_spec.rb
Added test, cleared errors