Gui with buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/CS3240Project.iml
	.idea/misc.xml
Merge remote-tracking branch 'origin/master'
Gui with all functionality. Just need to figure out how to link to server instance to retrieve data for queries