minor tweak to avoid errormessage on osx
Fixed khan-exercises.js to include changes lost during merge conflict.
Merge remote-tracking branch 'upstream/develop' into develop
Serverstart grep statement for local IP search updated to work on OSX _and_ linux.
added mailchimp email subscribe, testing
mailchimp has his bananas
Updated to new logo from Marcos. Thanks, Marcos!
Merge branch 'develop' of github.com:jamalex/ka-lite into develop
Merge pull request #36 from juliaogris/develop

Updated grep arguments in start.sh to not display errors on OSX.
Merge pull request #37 from PratikPramanik/mailchimp

Integrated Mailchimp into landing page signup form.
Merge branch 'develop' of github.com:jamalex/ka-lite into develop