Updating main and pop files
Updating main and pop files
Merge branch 'master' of https://github.com/synbiozis/gann

Conflicts:
	README.md