edited content
Merge branch 'master' of https://github.com/ogs13/dial

Conflicts:
	db.sqlite3
Merge branch 'master' of https://github.com/ogs13/dial
added pics
Merge branch 'master' of https://github.com/ogs13/dial
Merge branch 'master' of https://github.com/ogs13/dial