clearing up merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	ManPoints.iml
update lock file
Update footer