new view

Updated view to be more accurate with our designs still needs some work
though.
Merge remote-tracking branch 'origin/master'

Conflicts:
	NewBeginnings/src/mainWindow/MainView.java