fixing stuff
I should commit more
Merge branch 'master' of https://github.com/markshlick/aa

Conflicts:
	ref/postgres.md