merge conflict :rage:
merge conflict :rage:

paynegreen/DevlessHeroku,DevlessTeam/DV-SOFTACULOUS,DevlessTeam/DV-SOFTACULOUS,paynegreen/DevlessHeroku,DevlessTeam/DV-PHP-CORE,DevlessTeam/DV-PHP-CORE,paynegreen/laravelheroku,paynegreen/laravelheroku,paynegreen/laravelheroku,DevlessTeam/DV-SOFTACULOUS,paynegreen/DevlessHeroku,DevlessTeam/DV-PHP-CORE