Merge branch 'master' into development

* master:
  updated README
pull/198/head
Chris Simpkins 2016-03-06 18:27:01 +07:00
commit 87bbc59c1d
1 changed files with 1 additions and 1 deletions