Slight changes for presentation
Fixing merge issues

Merge https://github.com/HamidM250/S-Ware

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