update .gitignore and remove workspace.xml from the repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
remove debug statements