updated radio buttons to preselect value 2
added font support
changed color
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
updates to calc function