Server settings file
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
server stuff
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Server changes importserver
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra
Merge branch 'master' of github.com:DanielGarcia-Carrillo/Tunerra