1e4071b51d
Conflicts: app/models/Asset.php It looks like the same time I pulled depreciation out of the Asset class, uploads were being added in. It doesn't look like a conflict to me, but git couldn't figure it out. Oh Well.