beefeyetracker 1.0 for pythonanywhere
Merge remote-tracking branch 'origin/master' into beef2

Conflicts:
	database/VacsSQLite.db

-m "master-beef2 merger: lets hope it works..."