sign in and sign up with fancy box working.

I take back what I said about saying fancy box sucks.
trying to pull latest version
working on image carousel
carousel has weird z-index bug
still working on home page and trying to fix footer and header
Merge branch 'refs/heads/laura'

Conflicts:
	finalproject/.DS_Store
	finalproject/app/assets/javascripts/sign_in.js
	finalproject/app/views/devise/sessions/_sign_in.erb
	finalproject/app/views/home/index.html.erb
Merge branch 'master' of https://github.com/cemmanuel1/DBCFinalProject

Conflicts:
	finalproject/.DS_Store
	finalproject/app/assets/javascripts/sign_in.js
	finalproject/app/views/home/index.html.erb
	finalproject/vendor/assets/images/blank.gif
	finalproject/vendor/assets/images/fancybox_loading.gif
	finalproject/vendor/assets/images/fancybox_loading@2x.gif
	finalproject/vendor/assets/images/fancybox_overlay.png
	finalproject/vendor/assets/images/fancybox_sprite.png
	finalproject/vendor/assets/images/fancybox_sprite@2x.png
fancy box working now
Merge branch 'refs/heads/laura'

Conflicts:
	finalproject/app/assets/stylesheets/forms.css.scss
	finalproject/app/views/layouts/_navigation.html.erb
	finalproject/app/views/projects/show.html.erb