fixed database connection
Massive layout/Card Class Change

Layout modified to intended layout
Card class integrated (mostly) - modification needed
Functionality temporarily suspended - will need to be added back in,
primarily through modifying calc.java class
Added snapping effect back in
Minor Changes

-Made answer card visible
-Readded setters and getters in class numbercard
answer card drag and snap
one click set back on cards in workspace
Merge branch 'Roland-Layout' into develop
Images Added

Dillon has created some preliminary images that we can use!
I have added strings containing the location of the image.
The group assigned to integrating the images will need to write the
paintcomponent function to paint these images using the given string.
The image is located in the package/folder "images"
Set the backgrounds for the panels. Still need an image for the workspace panel. Panels need to be formatted so that text is not obscured.
Slight Image/Layout Change

Changed Card Bar Image
Very slight modifications to code and layout to enhance aesthetics
Updates from Develop