Lots of Glitches fixed

The program now looks really good!

Either we are really close, or I really screwed up. Hope it’s the first
one.
Conflicts Resolved

Conflicts:
	src/main/Master.java
May have made mistakes here too.