implement a basic sine curve
implement a basic sine curve
T7 Show a sine curve
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
	src/com/triscorp/ScientificCalculator/Entry.java
T7 Show a sine curve