Move angular.min.js from public/javascript to assets/js
Delete file
Merge branch 'master' of github.com-magiaelreencuentro:magiaelreencuentro/lasmagias