first commit
presentation update
Update README.md

Remove ".war" from example
Merge pull request #1 from aeo/master

Simple syntax update
Merge branch 'master' into gh-pages

* master:
  Update README.md
  presentation update
  first commit

Conflicts:
	README.md