Fixed a database error
Merge branch 'master' of github.com:arel/pulse

Conflicts:
	main.py