Merge branch 'master' into mindcoding

Conflicts:
	css/custom.css

diff --combined css/custom.css
index 289ae41853b0acfe4f689e24efa92fb6f9d5af5b,bc0b7eaa91f9ec5b0c334935b8dc71b59e85b1d9..4c4ba935ff8caaa82782c707be1fce6e0fa33706
--- 1/css/custom.css
--- 2/css/custom.css
+++ b/css/custom.css
@@@ -1,11 -1,17 +1,9 @@@
  h1#title{
        font-weight: bold;
        text-align: center;
-       padding: 0;
-       margin: 0;
        font-size: 3em !important;
  }
  
 -footer{
 -      width: 60em;
 -      margin: auto;
 -      margin-top: 6em;
 -      white-space: pre-wrap;
 -      color: #777;
 -}
 -
  #logo {
        margin: 5em auto 2em;
        display: block;
@@@ -42,6 -48,6 +40,10 @@@ div#result
        text-align: center;
  }
  
 +footer{
 +      padding: 1.5em 0;
 +}
++
+ a.dropdown-toggle{
+       cursor: pointer;
+ }