.project?
sundialframejava
why not?
testt
Merge branch 'master' of
https://github.com/briceorbryce/sundial-ics314.git

Conflicts:
	SunDialFrame.java
More testing
even more testing