Merge branch 'master' of /home/nameless/Projects/Programs/Java/myapp with conflicts.
SHIT