first michael
rename
gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	kuterless/db.sqlite3