Merge branch 'master' of github.com:blasbenito/virtualPollen

# Conflicts:
#	README.md