new urls
Merge branch 'vladimir'
Merge branch 'master' of https://github.com/aarondunn/aa100

Conflicts:
	.gitignore