Moving things around
Fixed hard-coded values
Updated Paint
Merge branch 'master' of https://github.com/Tigatok/JavaProjects