Merge pull request #9 from RichardHayesMassbay/master

Lines to be uncommented later.
testing thecommit

asdf
Merge pull request #10 from SJBenKiki/master

testing thecommit
Made the prototype MainWindow look better. Replaced the GridBagLayout with a null Layout for better customization, and added JDialogs and dummy frames so that each button does something.