merging
Added JFrame and JPanel functionality, and started paintComponent();