quick changes
Merge branch 'master' of https://github.com/richardkeenan/InTouchLog

Conflicts:
	.idea/workspace.xml