enhancement - bla
Merge branch 'master' of github.com:fieldtrip/playground

Conflicts:
	README
Merge branch 'master' of github.com:fieldtrip/playground
fixed README
Merge pull request #1 from jimher/master

enhancement
Merge branch 'master' of github.com:fieldtrip/playground
enhancement - edited readme