Merge branch 'master' into admin
Added folder to gitignore
Merge pull request #31 from Maimer/admin

Admin
Merge branch 'master' into truck_pictures
Removed destroy methods from non admin controllers.