Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Jason Turner 2014-12-21 13:15:12 -07:00
commit 7478d57264

View File

@ -16,6 +16,8 @@ Release under the BSD license, see "license.txt" for details.
Introduction
============
[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ChaiScript/ChaiScript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
ChaiScript is one of the only embedded scripting language designed from the
ground up to directly target C++ and take advantage of modern C++ development
techniques, working with the developer like he expects it to work. Being a