converting to eclipse from netbeans
StringTest passes
Merge branch 'develop' of git://github.com/pcpratts/rootbeer1 into develop

Conflicts:
	.gitignore
Merge branch 'develop' of https://github.com/millecker/rootbeer1 into develop