Changing git config
Added basic registration page
Merge remote-tracking branch 'remotes/origin/master' into heroku_master

Conflicts:
	config/initializers/secret_token.rb
Merge remote-tracking branch 'remotes/origin/master' into heroku_master

Conflicts:
	config/initializers/secret_token.rb
Testing IE box shadows
Testing IE box shadows
Testing IE box shadows
Testing IE box shadows
Testing IE box shadows
Testing IE box shadows
Testing IE box shadows
Testing IE box shadows
Testing IE box shadows
Fixed IE Box Shadows
Fixed IE Box Shadows
Fixed IE Box Shadows
Fixed IE Box Shadows
Fixed IE Box Shadows
Minor cleanup
Fixed carousel description