ts
ffff
qwerty
Merge branch 'master' of https://github.com/Niv-Mizzet/bann-pom.git

Conflicts:
	bannpom/views/admin/subject.py
asdfghj