Merge branch 'master' into mindcoding

Conflicts:
	css/custom.css

diff --cc css/custom.css
index 289ae41853b0acfe4f689e24efa92fb6f9d5af5b,bc0b7eaa91f9ec5b0c334935b8dc71b59e85b1d9..4c4ba935ff8caaa82782c707be1fce6e0fa33706
--- 1/css/custom.css
--- 2/css/custom.css
+++ b/css/custom.css
@@@ -42,6 -48,6 +40,10 @@@ div#result
        text-align: center;
  }
  
 +footer{
 +      padding: 1.5em 0;
 +}
++
+ a.dropdown-toggle{
+       cursor: pointer;
+ }