Merge

Merge branch 'master' of github.com:srvanderplas/VisualAptitude

Conflicts:
	Paper/Draft1/TestingVisualAptitude.pdf
Merge

Merge branch 'master' of github.com:srvanderplas/VisualAptitude

Conflicts:
	Paper/Draft1/TestingVisualAptitude.pdf