added width and height variables
added height and width variables
Merging changes from me and josh in Main.java