update
 Changes to be committed:
	modified:   README.md
	modified:   app.php
	modified:   models/media.php
	modified:   resources/dropbox/dropbox.js
	modified:   resources/js/settings.js
	modified:   resources/loader/loader.js

 Changes not staged for commit:
	modified:   DB/db.txt

 Untracked files:
	DB/db.txt~
	README.md~
	uploads/Image099.jpg