Stuff
Merge branch 'master' of https://github.com/Reparadocs/PolyProjects

Conflicts:
	PolyProjects/db.sqlite3