foxsina
Merge branch 'master' of github.com:foxclive/foxclive

Conflicts:
	const.py
	foxsina.py~
foxsina