adding the files I forgot
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
addToEnd, toString and simple tests with jUnit