.idea added to gitignore, hopefully we get no more conflict with it
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
date formated, comments page pimped !!