script for postgres
1
Merge branch 'master' of https://github.com/nulpteam/school.git
Merge branch 'q'
Merge branch 'q'
1
Merge branch 'master' into q
1
123
2
2
Merge branch 'master' into q

Conflicts:
	DontReadMePlease.txt