Added two environmental variables, hopefully they stay when sharing this project.
Merge remote-tracking branch 'Albertron/master'
Committing for a reason, but it is unknown.
Commit to try and figure out this two computer problem.