Attempt to get git to work for me
Merge branch 'master' of https://github.com/JebronLames/AntiProcrastination

Conflicts:
	db/development.sqlite3
	log/development.log