device edit not posting to db, commiting before troubleshooting
fixing conflict
uncommented total_price, refurb_price, and status on DevicesController
added local configuration, created env.php, and configured local/production environment seperation
Merge branch 'master' into ryan
resolved merge conflict on edit blade
deleted local environment app.php to troubleshoot blank screens
ask me about debugging using apache logs. I accidentally deleted a } in DevicesController. It produced a 'white screen of death' and didn't log anything at all to the laravel logs
Merge pull request #46 from 210geeks/ryan

In vagrant or on hosting, "sudo tail -f /var/log/apache2/error.log" is my new best friend.