Updated README file
Merge branch 'master' of github.com:icaoberg/falcon

Conflicts:
	README