rdyrdy gogogo
Merge remote-tracking branch 'origin/master'

Conflicts:
	newstopia/db.sqlite3
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
rdyrdy gogogo