Changes
Merge branch 'master' of https://github.com/daniel19/Java-Projects

Merging changes